- I was wrong, glut 3.7 is enough

[packages/BillardGL.git] / BillardGL-depracted.patch

diff -ruN billard-gl-1.75.orig/src/BillardGL.cpp billard-gl-1.75/src/BillardGL.cpp
--- billard-gl-1.75.orig/src/BillardGL.cpp	2002-04-23 18:17:42.000000000 +0200
+++ billard-gl-1.75/src/BillardGL.cpp	2005-01-23 03:50:58.000000000 +0100
@@ -35,8 +35,6 @@
 \r
 #include "BillardGL.h"\r
 \r
-#pragma comment(linker, "/subsystem:\"windows\" /entry:\"mainCRTStartup\"")\r
-\r
 //Tabellen\r
 GLfloat Bewegungstabelle[2000][16][3];\r
 GLint   Soundtabelle[1000];\r
diff -ruN billard-gl-1.75.orig/src/bmp.cpp billard-gl-1.75/src/bmp.cpp
--- billard-gl-1.75.orig/src/bmp.cpp	2002-04-22 12:31:24.000000000 +0200
+++ billard-gl-1.75/src/bmp.cpp	2005-01-23 03:50:43.000000000 +0100
@@ -4,14 +4,16 @@
 // Modified by Volker Blanz, 25.4.2001\r
 //\r
 \r
-#include <iostream.h>\r
-#include <fstream.h>\r
+#include <iostream>\r
+#include <fstream>\r
 #include <stdio.h>\r
 #include <string.h>\r
 #include "LA.h"\r
 #include "Namen.h"\r
 #include "bmp.h"\r
 \r
+using namespace std;\r
+\r
 // from ioutil:\r
 \r
 WORDX readWord(FILE *f) {\r
diff -ruN billard-gl-1.75.orig/src/Kugel.cpp billard-gl-1.75/src/Kugel.cpp
--- billard-gl-1.75.orig/src/Kugel.cpp	2002-04-22 12:58:08.000000000 +0200
+++ billard-gl-1.75/src/Kugel.cpp	2005-01-31 04:03:54.000000000 +0100
@@ -123,7 +123,7 @@
         glBindTexture(GL_TEXTURE_2D,Texturen[TG]);\r
 	sprintf(Name,"Texturen/%i/%i.bmp",TG,Nr); \r
 	loadBMP(tex_r,tex_g,tex_b,Name);\r
-	GLfloat *texcoord;\r
+	GLfloat *texcoord = NULL;\r
 	if (tex_r.nrh!=tex_r.nch) {\r
 	  GLfloat Aspekt=(tex_r.nch+1.0)/(tex_r.nrh+1.0);\r
 	  texcoord = (GLfloat*) malloc (20*(Aufloesung+1)*(Aufloesung+2)*sizeof(GLfloat));\r