瀏覽代碼

- fixes 1394

Ivan Savenko 12 年之前
父節點
當前提交
8ac6a1fcf4
共有 1 個文件被更改,包括 11 次插入2 次删除
  1. 11 2
      client/CPreGame.cpp

+ 11 - 2
client/CPreGame.cpp

@@ -2019,6 +2019,9 @@ void InfoCard::showAll(SDL_Surface * to)
 
 
 			if(!chatOn)
 			if(!chatOn)
 			{
 			{
+				CDefHandler * loss    = CGP ? CGP->loss    : CDefHandler::giveDef("SCNRLOSS.DEF");
+				CDefHandler * victory = CGP ? CGP->victory : CDefHandler::giveDef("SCNRVICT.DEF");
+
 				//victory conditions
 				//victory conditions
 				temp = SEL->current->mapHeader->victoryCondition.condition+1;
 				temp = SEL->current->mapHeader->victoryCondition.condition+1;
 				if (temp>20) temp=0;
 				if (temp>20) temp=0;
@@ -2028,7 +2031,7 @@ void InfoCard::showAll(SDL_Surface * to)
 
 
 				temp = SEL->current->mapHeader->victoryCondition.condition;
 				temp = SEL->current->mapHeader->victoryCondition.condition;
 				if (temp>12) temp=11;
 				if (temp>12) temp=11;
-				blitAtLoc(CGP->victory->ourImages[temp].bitmap, 24, 302, to); //victory cond descr
+				blitAtLoc(victory->ourImages[temp].bitmap, 24, 302, to); //victory cond descr
 
 
 				//loss conditoins
 				//loss conditoins
 				temp = SEL->current->mapHeader->lossCondition.typeOfLossCon+1;
 				temp = SEL->current->mapHeader->lossCondition.typeOfLossCon+1;
@@ -2038,7 +2041,13 @@ void InfoCard::showAll(SDL_Surface * to)
 
 
 				temp=SEL->current->mapHeader->lossCondition.typeOfLossCon;
 				temp=SEL->current->mapHeader->lossCondition.typeOfLossCon;
 				if (temp>12) temp=3;
 				if (temp>12) temp=3;
-				blitAtLoc(CGP->loss->ourImages[temp].bitmap, 24, 359, to); //loss cond
+				blitAtLoc(loss->ourImages[temp].bitmap, 24, 359, to); //loss cond
+
+				if (!CGP)
+				{
+					delete loss;
+					delete victory;
+				}
 			}
 			}
 
 
 			//difficulty
 			//difficulty