[patch] Fixes the sstream bug

crack-attack-sstream-fix.diff (text/plain), 4.73 KB, created by Andrew Sayman on 2004-04-30 03:43:28 UTC

Only in src: .swp
diff -u src_old/Attack.cxx src/Attack.cxx
--- src_old/Attack.cxx	2004-04-30 06:34:37.922069784 -0400
+++ src/Attack.cxx	2004-04-30 06:37:21.790158048 -0400
@@ -37,12 +37,12 @@
 
 using namespace std;
 
+#include "TextureLoader.h"
 #include "Game.h"
 #include "Attack.h"
 #include "Communicator.h"
 #include "MetaState.h"
 #include "Random.h"
-#include "TextureLoader.h"
 
 /*
  * Documentation
diff -u src_old/Displayer.cxx src/Displayer.cxx
--- src_old/Displayer.cxx	2004-04-30 06:34:37.950065528 -0400
+++ src/Displayer.cxx	2004-04-30 06:37:27.623271280 -0400
@@ -45,6 +45,7 @@
 
 using namespace std;
 
+#include "TextureLoader.h"
 #include "Game.h"
 #include "Displayer.h"
 #include "CelebrationManager.h"
@@ -53,7 +54,6 @@
 #include "LightManager.h"
 #include "MetaState.h"
 #include "SparkleManager.h"
-#include "TextureLoader.h"
 #include "String.h"
 #include "ScoreRecordManager.h"
 #include "Score.h"
diff -u src_old/GarbageFlavorImage.cxx src/GarbageFlavorImage.cxx
--- src_old/GarbageFlavorImage.cxx	2004-04-30 06:34:37.970062488 -0400
+++ src/GarbageFlavorImage.cxx	2004-04-30 06:37:34.219268536 -0400
@@ -35,10 +35,10 @@
 
 using namespace std;
 
+#include "TextureLoader.h"
 #include "Game.h"
 #include "Displayer.h"
 #include "GarbageFlavorImage.h"
-#include "TextureLoader.h"
 #include "Random.h"
 
 int GarbageFlavorImage::current_texture;
diff -u src_old/Score.cxx src/Score.cxx
--- src_old/Score.cxx	2004-04-30 06:34:37.984060360 -0400
+++ src/Score.cxx	2004-04-30 06:37:38.823568576 -0400
@@ -30,9 +30,9 @@
 
 using namespace std;
 
+#include "TextureLoader.h"
 #include "Game.h"
 #include "MetaState.h"
-#include "TextureLoader.h"
 #include "Score.h"
 
 int Score::score;
diff -u src_old/String.cxx src/String.cxx
--- src_old/String.cxx	2004-04-30 06:34:37.985060208 -0400
+++ src/String.cxx	2004-04-30 06:37:41.973089776 -0400
@@ -36,10 +36,10 @@
 
 using namespace std;
 
+#include "TextureLoader.h"
 #include "Game.h"
 #include "Displayer.h"
 #include "String.h"
-#include "TextureLoader.h"
 
 const char *String::letter_texture_files[DC_FONT_NUMBER][DC_LETTER_NUMBER]
  = { { GC_DATA_DIRECTORY "font0_0.tga",
diff -u src_old/TextureLoader.cxx src/TextureLoader.cxx
--- src_old/TextureLoader.cxx	2004-04-30 06:34:38.057049264 -0400
+++ src/TextureLoader.cxx	2004-04-30 06:37:45.029625112 -0400
@@ -39,8 +39,8 @@
 
 using namespace std;
 
-#include "Game.h"
 #include "TextureLoader.h"
+#include "Game.h"
 
 // the header of an uncompressed TGA file
 const GLubyte header_image[11] = { 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
diff -u src_old/TextureLoader.h src/TextureLoader.h
--- src_old/TextureLoader.h	2004-04-30 06:34:38.057049264 -0400
+++ src/TextureLoader.h	2004-04-30 06:34:54.967478488 -0400
@@ -10,6 +10,8 @@
 #  include <strstrea.h>
 #endif
 
+#include "Game.h"
+
 using namespace std;
 
 #define TL_GARBAGE_TEXTURE_TGA_ID     "Crack Attack! garbage texture"
diff -u src_old/obj_clock.cxx src/obj_clock.cxx
--- src_old/obj_clock.cxx	2004-04-30 06:34:38.067047744 -0400
+++ src/obj_clock.cxx	2004-04-30 06:37:48.053165464 -0400
@@ -34,9 +34,9 @@
 
 using namespace std;
 
+#include "TextureLoader.h"
 #include "Game.h"
 #include "Displayer.h"
-#include "TextureLoader.h"
 
 GLuint Displayer::clock_digit_textures[11];
 
diff -u src_old/obj_external_candy.cxx src/obj_external_candy.cxx
--- src_old/obj_external_candy.cxx	2004-04-30 06:34:38.068047592 -0400
+++ src/obj_external_candy.cxx	2004-04-30 06:37:51.609624800 -0400
@@ -34,9 +34,9 @@
 
 using namespace std;
 
+#include "TextureLoader.h"
 #include "Game.h"
 #include "Displayer.h"
-#include "TextureLoader.h"
 #include "MetaState.h"
 #include "GarbageFlavorImage.h"
 
diff -u src_old/obj_garbage.cxx src/obj_garbage.cxx
--- src_old/obj_garbage.cxx	2004-04-30 06:34:38.068047592 -0400
+++ src/obj_garbage.cxx	2004-04-30 06:37:55.281066656 -0400
@@ -36,9 +36,9 @@
 
 using namespace std;
 
+#include "TextureLoader.h"
 #include "Game.h"
 #include "Displayer.h"
-#include "TextureLoader.h"
 #include "GarbageFlavorImage.h"
 #include "MetaState.h"
 #include "Random.h"
diff -u src_old/obj_messages.cxx src/obj_messages.cxx
--- src_old/obj_messages.cxx	2004-04-30 06:34:38.074046680 -0400
+++ src/obj_messages.cxx	2004-04-30 06:37:58.898516720 -0400
@@ -38,9 +38,9 @@
 
 using namespace std;
 
+#include "TextureLoader.h"
 #include "Game.h"
 #include "Displayer.h"
-#include "TextureLoader.h"
 #include "MessageManager.h"
 
 GLuint Displayer::message_1x1_list;
diff -u src_old/obj_sign.cxx src/obj_sign.cxx
--- src_old/obj_sign.cxx	2004-04-30 06:34:38.075046528 -0400
+++ src/obj_sign.cxx	2004-04-30 06:38:01.752082912 -0400
@@ -34,9 +34,9 @@
 
 using namespace std;
 
+#include "TextureLoader.h"
 #include "Game.h"
 #include "Displayer.h"
-#include "TextureLoader.h"
 
 GLuint Displayer::sign_small_list;
 GLuint Displayer::sign_large_list;