From 0c3205dd214931941d466dc47efc0eeda9d23e01 Mon Sep 17 00:00:00 2001
From: Andrei Drexler <makro@rq3.com>
Date: Thu, 6 Jun 2002 18:10:51 +0000
Subject: [PATCH] Loading a map with pre-2.0 breakables crashed Q3. Added temp
 fix

---
 reaction/cgame/cg_main.c |  8 +++++++-
 reaction/cgame/cgame.plg | 44 +---------------------------------------
 2 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/reaction/cgame/cg_main.c b/reaction/cgame/cg_main.c
index e1dc530c..4eed6035 100644
--- a/reaction/cgame/cg_main.c
+++ b/reaction/cgame/cg_main.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.74  2002/06/06 18:10:51  makro
+// Loading a map with pre-2.0 breakables crashed Q3. Added temp fix
+//
 // Revision 1.73  2002/06/06 03:01:46  blaze
 // a breakable with a underscore in it's name will now try and load files from it's parent if it cant find any itself
 // ex glass_blue will load sounds from glass if there is no glass_blue/sounds/break1.wav
@@ -1233,7 +1236,10 @@ static void CG_RegisterBreakables(void){
       else
       {
         strncpy(baseName,name,80);
-        baseName[strstr(name,"_") - name]='\0';
+        //Makro - crash bug fix; TODO: find a better way to handle this
+		if (!strstr(name, "_"))
+			return;
+		baseName[strstr(name,"_") - name]='\0';
 			  cgs.media.breakables[id].model[0] = trap_R_RegisterModel( va("breakables/%s/models/break1.md3",baseName));
  			  cgs.media.breakables[id].model[1] = trap_R_RegisterModel( va("breakables/%s/models/break2.md3",baseName));
  			  cgs.media.breakables[id].model[2] = trap_R_RegisterModel( va("breakables/%s/models/break3.md3",baseName));
diff --git a/reaction/cgame/cgame.plg b/reaction/cgame/cgame.plg
index c677599c..4ee5866c 100644
--- a/reaction/cgame/cgame.plg
+++ b/reaction/cgame/cgame.plg
@@ -6,53 +6,11 @@
 --------------------Configuration: cgame - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPCF.tmp" with contents
-[
-/nologo /G5 /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR"Debug/" /Fp"Debug/cgame.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /c 
-"C:\Development\reaction\cgame\cg_main.c"
-]
-Creating command line "cl.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPCF.tmp" 
-Creating temporary file "C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPD0.tmp" with contents
-[
-/nologo /base:"0x30000000" /subsystem:windows /dll /incremental:yes /pdb:"Debug/cgamex86.pdb" /map:"Debug/cgamex86.map" /debug /machine:I386 /def:".\cgame.def" /out:"../Debug/cgamex86.dll" /implib:"Debug/cgamex86.lib" 
-.\Debug\bg_misc.obj
-.\Debug\bg_pmove.obj
-.\Debug\bg_slidemove.obj
-.\Debug\cg_consolecmds.obj
-.\Debug\cg_draw.obj
-.\Debug\cg_drawtools.obj
-.\Debug\cg_effects.obj
-.\Debug\cg_ents.obj
-.\Debug\cg_event.obj
-.\Debug\cg_info.obj
-.\Debug\cg_localents.obj
-.\Debug\cg_main.obj
-.\Debug\cg_marks.obj
-.\Debug\cg_players.obj
-.\Debug\cg_playerstate.obj
-.\Debug\cg_predict.obj
-.\Debug\cg_scoreboard.obj
-.\Debug\cg_servercmds.obj
-.\Debug\cg_snapshot.obj
-.\Debug\cg_syscalls.obj
-.\Debug\cg_view.obj
-.\Debug\cg_weapons.obj
-.\Debug\q_math.obj
-.\Debug\q_shared.obj
-.\Debug\ui_shared.obj
-]
-Creating command line "link.exe @C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\RSPD0.tmp"
-<h3>Output Window</h3>
-Compiling...
-cg_main.c
-C:\Development\reaction\cgame\cg_main.c(1245) : error C2110: cannot add two pointers
-C:\Development\reaction\cgame\cg_main.c(1245) : fatal error C1903: unable to recover from previous error(s); stopping compilation
-Error executing cl.exe.
 
 
 
 <h3>Results</h3>
-cgamex86.dll - 2 error(s), 0 warning(s)
+cgamex86.dll - 0 error(s), 0 warning(s)
 </pre>
 </body>
 </html>