Skip to content

Commit

Permalink
Fix naming conflict with DOS32 port
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidKinder committed Apr 29, 2011
1 parent 60a39fe commit 7c453c0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions Dos32/allegro.c
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ int history_index = 0;
/* Display bitmap variables */
BITMAP* display = NULL;
PALETTE palette;
int gfx_mode = GFX_AUTODETECT_FULLSCREEN;
int allegro_gfx_mode = GFX_AUTODETECT_FULLSCREEN;
int screen_width = 640;
int screen_height = 480;
int text_x = 0;
Expand Down Expand Up @@ -581,7 +581,7 @@ void prepare_screen(void)

/* Set up the screen. */
set_color_depth(8);
if (set_gfx_mode(gfx_mode,screen_width,screen_height,0,0) < 0)
if (set_gfx_mode(allegro_gfx_mode,screen_width,screen_height,0,0) < 0)
fatal(allegro_error);
clear(screen);
set_default_palette();
Expand Down Expand Up @@ -1346,13 +1346,13 @@ int main(int argc, char** argv)
/* Get the display mode, width and height. */
if (display_type == 0)
{
gfx_mode = GFX_AUTODETECT_WINDOWED;
allegro_gfx_mode = GFX_AUTODETECT_WINDOWED;
screen_width = display_width;
screen_height = display_height;
}
else
{
gfx_mode = GFX_AUTODETECT_FULLSCREEN;
allegro_gfx_mode = GFX_AUTODETECT_FULLSCREEN;
screen_width = display_modes[display_type].width;
screen_height = display_modes[display_type].height;
}
Expand Down Expand Up @@ -1404,7 +1404,7 @@ int main(int argc, char** argv)
int get_file_name(const char* prompt, const char* filter, char* buffer, int save)
{
#ifdef _WIN32
if (gfx_mode == GFX_AUTODETECT_WINDOWED)
if (allegro_gfx_mode == GFX_AUTODETECT_WINDOWED)
{
OPENFILENAME open_file;
BOOL got_file = FALSE;
Expand Down
6 changes: 3 additions & 3 deletions level9.c
Original file line number Diff line number Diff line change
Expand Up @@ -2997,7 +2997,7 @@ int scaley(int y)
return (gfx_mode == GFX_V2) ? 127 - (y>>7) : 95 - (((y>>5)+(y>>6))>>3);
}

void set_gfx_mode(void)
void detect_gfx_mode(void)
{
if (L9GameType == L9_V3)
{
Expand Down Expand Up @@ -3042,7 +3042,7 @@ void _screen(void)
return;
}

set_gfx_mode();
detect_gfx_mode();
l9textmode = *codeptr++;
if (l9textmode)
{
Expand Down Expand Up @@ -3501,7 +3501,7 @@ void show_picture(int pic)
graphics, so here graphics are enabled if necessary. */
if ((screencalled == 0) && (l9textmode == 0))
{
set_gfx_mode();
detect_gfx_mode();
l9textmode = 1;
os_graphics(1);
}
Expand Down

0 comments on commit 7c453c0

Please sign in to comment.