Skip to content

Fixes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0x64c merged 2 commits into from
Jun 7, 2016
Merged

Fixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f184d9e
vars.c: corrected size of texturepointer[] array
senquack Jun 7, 2016
1e5dab5
zcore: corrected GCW Zero SDL vid-mode flags
senquack Jun 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion vars.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ u8 meshtid[MESH_CNT];

u8 textureheader[256][4],texturereload[256];
u16 texturedata[1048576*5/2];
u32 texturepointer[128];
//senquack - should be [256], judging from its use in zrmloadtextures() in zresm.c:
//u32 texturepointer[128];
u32 texturepointer[256];

u16 meshcount;

Expand Down
4 changes: 3 additions & 1 deletion vars.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ extern u8 meshtid[MESH_CNT];

extern u8 textureheader[256][4],texturereload[256];
extern u16 texturedata[1048576*5/2];
extern u32 texturepointer[128];
//senquack - should be [256], judging from its use in zrmloadtextures() in zresm.c:
//extern u32 texturepointer[128];
extern u32 texturepointer[256];

extern u16 meshcount;

Expand Down
2 changes: 1 addition & 1 deletion zcore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ void zcore_video_init(void)
#if defined(GCW)

////////////////////////////////////////////////////////////////////////////////////////
screen=SDL_SetVideoMode(320,240,16, SDL_OPENGL);
screen=SDL_SetVideoMode(320,240,16, SDL_SWSURFACE);

const char* output;

Expand Down