From c77a0d42369ee929191d0c3773fd7a009311986d Mon Sep 17 00:00:00 2001
From: jsalmon3 <>
Date: Sun, 29 Aug 2004 18:08:34 +0000
Subject: [PATCH] Fix crash
---
src/game/intro.cpp | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/game/intro.cpp b/src/game/intro.cpp
index e02ca0722..8c5c89c11 100644
--- a/src/game/intro.cpp
+++ b/src/game/intro.cpp
@@ -1186,7 +1186,7 @@ static int GameStatsDrawFunc(int frame)
void ShowStats(void)
{
EventCallback callbacks;
- Graphic** g;
+ Graphic* g;
int done;
int old_video_sync;
int frame;
@@ -1209,16 +1209,16 @@ void ShowStats(void)
g = NULL;
if (GameResult == GameVictory) {
if (TheUI.VictoryBackgroundG) {
- g = &TheUI.VictoryBackgroundG;
+ g = TheUI.VictoryBackgroundG;
}
} else {
if (TheUI.DefeatBackgroundG) {
- g = &TheUI.DefeatBackgroundG;
+ g = TheUI.DefeatBackgroundG;
}
}
- if (g && *g) {
- LoadGraphic(*g);
- ResizeGraphic(*g, VideoWidth, VideoHeight);
+ if (g) {
+ LoadGraphic(g);
+ ResizeGraphic(g, VideoWidth, VideoHeight);
}
UseContinueButton = 1;
@@ -1230,11 +1230,11 @@ void ShowStats(void)
IntroNoEvent = 1;
IntroButtonPressed = 0;
while (1) {
- if (g && *g) {
- VideoDrawSubClip(*g, 0, 0,
- (*g)->Width, (*g)->Height,
- (VideoWidth - (*g)->Width) / 2,
- (VideoHeight - (*g)->Height) / 2);
+ if (g) {
+ VideoDrawSubClip(g, 0, 0,
+ g->Width, g->Height,
+ (VideoWidth - g->Width) / 2,
+ (VideoHeight - g->Height) / 2);
}
GameStatsDrawFunc(frame);
DrawContinueButton();
@@ -1251,9 +1251,6 @@ void ShowStats(void)
++frame;
}
- FreeGraphic(*g);
- *g = NULL;
-
VideoSyncSpeed = old_video_sync;
SetVideoSync();
}