]>
Commit | Line | Data |
---|---|---|
09d2495b BZ |
1 | diff -ruN billard-gl-1.75.orig/src/BillardGL.cpp billard-gl-1.75/src/BillardGL.cpp |
2 | --- billard-gl-1.75.orig/src/BillardGL.cpp 2002-04-23 18:17:42.000000000 +0200 | |
3 | +++ billard-gl-1.75/src/BillardGL.cpp 2005-01-23 03:50:58.000000000 +0100 | |
4 | @@ -35,8 +35,6 @@ | |
5 | \r | |
6 | #include "BillardGL.h"\r | |
7 | \r | |
8 | -#pragma comment(linker, "/subsystem:\"windows\" /entry:\"mainCRTStartup\"")\r | |
9 | -\r | |
10 | //Tabellen\r | |
11 | GLfloat Bewegungstabelle[2000][16][3];\r | |
12 | GLint Soundtabelle[1000];\r | |
13 | diff -ruN billard-gl-1.75.orig/src/bmp.cpp billard-gl-1.75/src/bmp.cpp | |
14 | --- billard-gl-1.75.orig/src/bmp.cpp 2002-04-22 12:31:24.000000000 +0200 | |
15 | +++ billard-gl-1.75/src/bmp.cpp 2005-01-23 03:50:43.000000000 +0100 | |
16 | @@ -4,14 +4,16 @@ | |
17 | // Modified by Volker Blanz, 25.4.2001\r | |
18 | //\r | |
19 | \r | |
20 | -#include <iostream.h>\r | |
21 | -#include <fstream.h>\r | |
22 | +#include <iostream>\r | |
23 | +#include <fstream>\r | |
24 | #include <stdio.h>\r | |
25 | #include <string.h>\r | |
26 | #include "LA.h"\r | |
27 | #include "Namen.h"\r | |
28 | #include "bmp.h"\r | |
29 | \r | |
30 | +using namespace std;\r | |
31 | +\r | |
32 | // from ioutil:\r | |
33 | \r | |
34 | WORDX readWord(FILE *f) {\r | |
35 | diff -ruN billard-gl-1.75.orig/src/Kugel.cpp billard-gl-1.75/src/Kugel.cpp | |
36 | --- billard-gl-1.75.orig/src/Kugel.cpp 2002-04-22 12:58:08.000000000 +0200 | |
37 | +++ billard-gl-1.75/src/Kugel.cpp 2005-01-31 04:03:54.000000000 +0100 | |
38 | @@ -123,7 +123,7 @@ | |
39 | glBindTexture(GL_TEXTURE_2D,Texturen[TG]);\r | |
40 | sprintf(Name,"Texturen/%i/%i.bmp",TG,Nr); \r | |
41 | loadBMP(tex_r,tex_g,tex_b,Name);\r | |
42 | - GLfloat *texcoord;\r | |
43 | + GLfloat *texcoord = NULL;\r | |
44 | if (tex_r.nrh!=tex_r.nch) {\r | |
45 | GLfloat Aspekt=(tex_r.nch+1.0)/(tex_r.nrh+1.0);\r | |
46 | texcoord = (GLfloat*) malloc (20*(Aufloesung+1)*(Aufloesung+2)*sizeof(GLfloat));\r |