RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compile on win32

This commit is contained in:
David Rose 2004-11-26 20:35:19 +00:00
parent 343408561a
commit 5f2d0db993
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/framework/rock_floor_src.cxx
View File

@ -5,7 +5,7 @@
* bin2c -n rock_floor -static -string -o rock_floor_src.cxx /home/drose/fit/egg/rock-floor.rgb
*/
static const char rock_floor[] = {
static const unsigned char rock_floor[] = {
0x01, 0xda, 0x01, 0x01, 0x00, 0x03, 0x01, 0x00, 0x01, 0x00, 0x00,
0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

2
panda/src/framework/windowFramework.cxx
View File

@ -642,7 +642,7 @@ load_default_model(const NodePath &parent) {
// Get the default texture to apply to the triangle; it's compiled
// into the code these days.
string rock_floor_string(rock_floor, rock_floor_len);
string rock_floor_string((const char *)rock_floor, rock_floor_len);
istringstream rock_floor_strm(rock_floor_string);
PNMImage rock_floor_pnm;
if (rock_floor_pnm.read(rock_floor_strm, "rock-floor.rgb")) {