TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Switch gr_printf(x,y,s) to gr_string(x,y,s)

Browse source
This commit is contained in:
Kp 2012-06-24 20:53:52 +00:00
parent ff35f946a9
commit 70149044c1
8 changed files with 93 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
similar/main/automap.cpp
View file

@ -499,7 +499,7 @@ static void draw_automap(automap *am)
}
#elif defined(DXX_BUILD_DESCENT_II)
gr_string((SWIDTH/10.666), (SHEIGHT/1.126), TXT_TURN_SHIP);
gr_printf((SWIDTH/10.666), (SHEIGHT/1.083), "F9/F10 Changes viewing distance");
gr_string((SWIDTH/10.666), (SHEIGHT/1.083), "F9/F10 Changes viewing distance");
gr_string((SWIDTH/10.666), (SHEIGHT/1.043), TXT_AUTOMAP_MARKER);
#endif

2
similar/main/console.cpp
View file

@ -155,7 +155,7 @@ static void con_draw(void)
gr_rect(0,0,SWIDTH,LINE_SPACING);
gr_set_fontcolor(BM_XRGB(255,255,255),-1);
gr_printf(FSPACX(1),FSPACY(1),"%s LOG", DESCENT_VERSION);
gr_printf(SWIDTH-FSPACX(110),FSPACY(1),"PAGE-UP/DOWN TO SCROLL");
gr_string(SWIDTH-FSPACX(110),FSPACY(1),"PAGE-UP/DOWN TO SCROLL");
}
static int con_handler(window *wind, d_event *event)

4
similar/main/gamecntl.cpp
View file

@ -492,7 +492,7 @@ static int HandleDemoKey(int key)
gr_set_current_canvas(NULL);
render_frame(0, 0);
gr_set_curfont(MEDIUM2_FONT);
gr_printf(SWIDTH-FSPACX(92),SHEIGHT-LINE_SPACING,"DXX-Rebirth\n");
gr_string(SWIDTH-FSPACX(92),SHEIGHT-LINE_SPACING,"DXX-Rebirth\n");
gr_flip();
save_screen_shot(0);
}
@ -749,7 +749,7 @@ static int HandleSystemKey(int key)
gr_set_current_canvas(NULL);
render_frame(0, 0);
gr_set_curfont(MEDIUM2_FONT);
gr_printf(SWIDTH-FSPACX(92),SHEIGHT-LINE_SPACING,"DXX-Rebirth\n");
gr_string(SWIDTH-FSPACX(92),SHEIGHT-LINE_SPACING,"DXX-Rebirth\n");
gr_flip();
save_screen_shot(0);
}

22
similar/main/gamerend.cpp
View file

@ -164,16 +164,16 @@ static void show_netplayerinfo()
// player information (name, kills, ping, game efficiency)
y+=LINE_SPACING*2;
gr_printf(x,y,"player");
gr_string(x,y,"player");
if (Game_mode & GM_MULTI_COOP)
gr_printf(x+FSPACX(8)*7,y,"score");
gr_string(x+FSPACX(8)*7,y,"score");
else
{
gr_printf(x+FSPACX(8)*7,y,"kills");
gr_printf(x+FSPACX(8)*12,y,"deaths");
gr_string(x+FSPACX(8)*7,y,"kills");
gr_string(x+FSPACX(8)*12,y,"deaths");
}
gr_printf(x+FSPACX(8)*18,y,"ping");
gr_printf(x+FSPACX(8)*23,y,"efficiency");
gr_string(x+FSPACX(8)*18,y,"ping");
gr_string(x+FSPACX(8)*23,y,"efficiency");
// process players table
for (i=0; i<MAX_PLAYERS; i++)
@ -208,8 +208,8 @@ static void show_netplayerinfo()
if (Game_mode & GM_TEAM)
{
gr_set_fontcolor(255,-1);
gr_printf(x,y,"team");
gr_printf(x+FSPACX(8)*8,y,"score");
gr_string(x,y,"team");
gr_string(x+FSPACX(8)*8,y,"score");
y+=LINE_SPACING;
gr_set_fontcolor(BM_XRGB(player_rgb[0].r,player_rgb[0].g,player_rgb[0].b),-1 );
gr_printf(x,y,"%s:",Netgame.team_name[0]);
@ -234,7 +234,7 @@ static void show_netplayerinfo()
if (game_mode_hoard())
{
if (PhallicMan==-1)
gr_printf(0x8000,y,"There is no record yet for this level.");
gr_string(0x8000,y,"There is no record yet for this level.");
else
gr_printf(0x8000,y,"%s has the record at %d points.",Players[PhallicMan].callsign,PhallicLimit);
}
@ -247,7 +247,7 @@ static void show_netplayerinfo()
if (eff<60)
gr_printf(0x8000,y,"is %s your ranking.",eff_strings[eff/10]);
else
gr_printf(0x8000,y,"is serving you well.");
gr_string(0x8000,y,"is serving you well.");
y+=LINE_SPACING;
gr_printf(0x8000,y,"your rank is: %s",RankStrings[GetMyNetRanking()]);
}
@ -571,7 +571,7 @@ void game_render_frame_mono(int flip)
gr_set_curfont( GAME_FONT );
gr_set_fontcolor( BM_XRGB(27,0,0), -1 );
gr_printf(0x8000, FSPACY(1), "Guided Missile View");
gr_string(0x8000, FSPACY(1), "Guided Missile View");
show_reticle(RET_TYPE_CROSS_V1, 0);

2
similar/main/gauges.cpp
View file

@ -2279,7 +2279,7 @@ static void sb_draw_afterburner()
gr_set_fontcolor(BM_XRGB(12,12,12),-1 );
gr_get_string_size(ab_str, &w, &h, &aw );
gr_printf(HUD_SCALE_X(SB_AFTERBURNER_GAUGE_X+(SB_AFTERBURNER_GAUGE_W+1)/2)-(w/2), HUD_SCALE_Y(SB_AFTERBURNER_GAUGE_Y+(SB_AFTERBURNER_GAUGE_H - GAME_FONT->ft_h - (GAME_FONT->ft_h / 4))), "AB");
gr_string(HUD_SCALE_X(SB_AFTERBURNER_GAUGE_X+(SB_AFTERBURNER_GAUGE_W+1)/2)-(w/2), HUD_SCALE_Y(SB_AFTERBURNER_GAUGE_Y+(SB_AFTERBURNER_GAUGE_H - GAME_FONT->ft_h - (GAME_FONT->ft_h / 4))), "AB");
gr_set_current_canvas(NULL);
}
#endif

142
similar/main/net_udp.cpp
View file

@ -5249,82 +5249,82 @@ static int show_game_rules_handler(window *wind, d_event *event, netgame_info *n
gr_string( 0x8000, FSPACY(15), "NETGAME INFO");
grd_curcanv->cv_font = GAME_FONT;
gr_printf( FSPACX( 25),FSPACY( 35), "Reactor Life:");
gr_printf( FSPACX( 25),FSPACY( 41), "Max Time:");
gr_printf( FSPACX( 25),FSPACY( 47), "Kill Goal:");
gr_printf( FSPACX( 25),FSPACY( 53), "Packets per sec.:");
gr_printf( FSPACX(155),FSPACY( 35), "Invul when reappearing:");
gr_printf( FSPACX(155),FSPACY( 41), "Marker camera views:");
gr_printf( FSPACX(155),FSPACY( 47), "Indestructible lights:");
gr_printf( FSPACX(155),FSPACY( 53), "Bright player ships:");
gr_printf( FSPACX(155),FSPACY( 59), "Show enemy names on hud:");
gr_printf( FSPACX(155),FSPACY( 65), "Show players on automap:");
gr_printf( FSPACX(155),FSPACY( 71), "No friendly Fire:");
gr_printf( FSPACX( 25),FSPACY( 80), "Allowed Objects");
gr_printf( FSPACX( 25),FSPACY( 90), "Laser Upgrade:");
gr_printf( FSPACX( 25),FSPACY( 96), "Super Laser:");
gr_printf( FSPACX( 25),FSPACY(102), "Quad Laser:");
gr_printf( FSPACX( 25),FSPACY(108), "Vulcan Cannon:");
gr_printf( FSPACX( 25),FSPACY(114), "Gauss Cannon:");
gr_printf( FSPACX( 25),FSPACY(120), "Spreadfire Cannon:");
gr_printf( FSPACX( 25),FSPACY(126), "Helix Cannon:");
gr_printf( FSPACX( 25),FSPACY(132), "Plasma Cannon:");
gr_printf( FSPACX( 25),FSPACY(138), "Phoenix Cannon:");
gr_printf( FSPACX( 25),FSPACY(144), "Fusion Cannon:");
gr_printf( FSPACX( 25),FSPACY(150), "Omega Cannon:");
gr_printf( FSPACX(170),FSPACY( 90), "Flash Missile:");
gr_printf( FSPACX(170),FSPACY( 96), "Homing Missile:");
gr_printf( FSPACX(170),FSPACY(102), "Guided Missile:");
gr_printf( FSPACX(170),FSPACY(108), "Proximity Bomb:");
gr_printf( FSPACX(170),FSPACY(114), "Smart Mine:");
gr_printf( FSPACX(170),FSPACY(120), "Smart Missile:");
gr_printf( FSPACX(170),FSPACY(126), "Mercury Missile:");
gr_printf( FSPACX(170),FSPACY(132), "Mega Missile:");
gr_printf( FSPACX(170),FSPACY(138), "Earthshaker Missile:");
gr_printf( FSPACX( 25),FSPACY(160), "Afterburner:");
gr_printf( FSPACX( 25),FSPACY(166), "Headlight:");
gr_printf( FSPACX( 25),FSPACY(172), "Energy->Shield Conv:");
gr_printf( FSPACX(170),FSPACY(160), "Invulnerability:");
gr_printf( FSPACX(170),FSPACY(166), "Cloaking Device:");
gr_printf( FSPACX(170),FSPACY(172), "Ammo Rack:");
gr_string( FSPACX( 25),FSPACY( 35), "Reactor Life:");
gr_string( FSPACX( 25),FSPACY( 41), "Max Time:");
gr_string( FSPACX( 25),FSPACY( 47), "Kill Goal:");
gr_string( FSPACX( 25),FSPACY( 53), "Packets per sec.:");
gr_string( FSPACX(155),FSPACY( 35), "Invul when reappearing:");
gr_string( FSPACX(155),FSPACY( 41), "Marker camera views:");
gr_string( FSPACX(155),FSPACY( 47), "Indestructible lights:");
gr_string( FSPACX(155),FSPACY( 53), "Bright player ships:");
gr_string( FSPACX(155),FSPACY( 59), "Show enemy names on hud:");
gr_string( FSPACX(155),FSPACY( 65), "Show players on automap:");
gr_string( FSPACX(155),FSPACY( 71), "No friendly Fire:");
gr_string( FSPACX( 25),FSPACY( 80), "Allowed Objects");
gr_string( FSPACX( 25),FSPACY( 90), "Laser Upgrade:");
gr_string( FSPACX( 25),FSPACY( 96), "Super Laser:");
gr_string( FSPACX( 25),FSPACY(102), "Quad Laser:");
gr_string( FSPACX( 25),FSPACY(108), "Vulcan Cannon:");
gr_string( FSPACX( 25),FSPACY(114), "Gauss Cannon:");
gr_string( FSPACX( 25),FSPACY(120), "Spreadfire Cannon:");
gr_string( FSPACX( 25),FSPACY(126), "Helix Cannon:");
gr_string( FSPACX( 25),FSPACY(132), "Plasma Cannon:");
gr_string( FSPACX( 25),FSPACY(138), "Phoenix Cannon:");
gr_string( FSPACX( 25),FSPACY(144), "Fusion Cannon:");
gr_string( FSPACX( 25),FSPACY(150), "Omega Cannon:");
gr_string( FSPACX(170),FSPACY( 90), "Flash Missile:");
gr_string( FSPACX(170),FSPACY( 96), "Homing Missile:");
gr_string( FSPACX(170),FSPACY(102), "Guided Missile:");
gr_string( FSPACX(170),FSPACY(108), "Proximity Bomb:");
gr_string( FSPACX(170),FSPACY(114), "Smart Mine:");
gr_string( FSPACX(170),FSPACY(120), "Smart Missile:");
gr_string( FSPACX(170),FSPACY(126), "Mercury Missile:");
gr_string( FSPACX(170),FSPACY(132), "Mega Missile:");
gr_string( FSPACX(170),FSPACY(138), "Earthshaker Missile:");
gr_string( FSPACX( 25),FSPACY(160), "Afterburner:");
gr_string( FSPACX( 25),FSPACY(166), "Headlight:");
gr_string( FSPACX( 25),FSPACY(172), "Energy->Shield Conv:");
gr_string( FSPACX(170),FSPACY(160), "Invulnerability:");
gr_string( FSPACX(170),FSPACY(166), "Cloaking Device:");
gr_string( FSPACX(170),FSPACY(172), "Ammo Rack:");
gr_set_fontcolor(BM_XRGB(255,255,255),-1);
gr_printf( FSPACX(115),FSPACY( 35), "%i Min", netgame->control_invul_time/F1_0/60);
gr_printf( FSPACX(115),FSPACY( 41), "%i Min", netgame->PlayTimeAllowed*5);
gr_printf( FSPACX(115),FSPACY( 47), "%i", netgame->KillGoal*5);
gr_printf( FSPACX(115),FSPACY( 53), "%i", netgame->PacketsPerSec);
gr_printf( FSPACX(275),FSPACY( 35), netgame->InvulAppear?"ON":"OFF");
gr_printf( FSPACX(275),FSPACY( 41), netgame->Allow_marker_view?"ON":"OFF");
gr_printf( FSPACX(275),FSPACY( 47), netgame->AlwaysLighting?"ON":"OFF");
gr_printf( FSPACX(275),FSPACY( 53), netgame->BrightPlayers?"ON":"OFF");
gr_printf( FSPACX(275),FSPACY( 59), netgame->ShowEnemyNames?"ON":"OFF");
gr_printf( FSPACX(275),FSPACY( 65), netgame->game_flag.show_on_map?"ON":"OFF");
gr_printf( FSPACX(275),FSPACY( 71), netgame->NoFriendlyFire?"ON":"OFF");
gr_printf( FSPACX(130),FSPACY( 90), netgame->AllowedItems & NETFLAG_DOLASER?"YES":"NO");
gr_printf( FSPACX(130),FSPACY( 96), netgame->AllowedItems & NETFLAG_DOSUPERLASER?"YES":"NO");
gr_printf( FSPACX(130),FSPACY(102), netgame->AllowedItems & NETFLAG_DOQUAD?"YES":"NO");
gr_printf( FSPACX(130),FSPACY(108), netgame->AllowedItems & NETFLAG_DOVULCAN?"YES":"NO");
gr_printf( FSPACX(130),FSPACY(114), netgame->AllowedItems & NETFLAG_DOGAUSS?"YES":"NO");
gr_printf( FSPACX(130),FSPACY(120), netgame->AllowedItems & NETFLAG_DOSPREAD?"YES":"NO");
gr_printf( FSPACX(130),FSPACY(126), netgame->AllowedItems & NETFLAG_DOHELIX?"YES":"NO");
gr_printf( FSPACX(130),FSPACY(132), netgame->AllowedItems & NETFLAG_DOPLASMA?"YES":"NO");
gr_printf( FSPACX(130),FSPACY(138), netgame->AllowedItems & NETFLAG_DOPHOENIX?"YES":"NO");
gr_printf( FSPACX(130),FSPACY(144), netgame->AllowedItems & NETFLAG_DOFUSION?"YES":"NO");
gr_printf( FSPACX(130),FSPACY(150), netgame->AllowedItems & NETFLAG_DOOMEGA?"YES":"NO");
gr_printf( FSPACX(275),FSPACY( 90), netgame->AllowedItems & NETFLAG_DOFLASH?"YES":"NO");
gr_printf( FSPACX(275),FSPACY( 96), netgame->AllowedItems & NETFLAG_DOHOMING?"YES":"NO");
gr_printf( FSPACX(275),FSPACY(102), netgame->AllowedItems & NETFLAG_DOGUIDED?"YES":"NO");
gr_printf( FSPACX(275),FSPACY(108), netgame->AllowedItems & NETFLAG_DOPROXIM?"YES":"NO");
gr_printf( FSPACX(275),FSPACY(114), netgame->AllowedItems & NETFLAG_DOSMARTMINE?"YES":"NO");
gr_printf( FSPACX(275),FSPACY(120), netgame->AllowedItems & NETFLAG_DOSMART?"YES":"NO");
gr_printf( FSPACX(275),FSPACY(126), netgame->AllowedItems & NETFLAG_DOMERCURY?"YES":"NO");
gr_printf( FSPACX(275),FSPACY(132), netgame->AllowedItems & NETFLAG_DOMEGA?"YES":"NO");
gr_printf( FSPACX(275),FSPACY(138), netgame->AllowedItems & NETFLAG_DOSHAKER?"YES":"NO");
gr_printf( FSPACX(130),FSPACY(160), netgame->AllowedItems & NETFLAG_DOAFTERBURNER?"YES":"NO");
gr_printf( FSPACX(130),FSPACY(166), netgame->AllowedItems & NETFLAG_DOHEADLIGHT?"YES":"NO");
gr_printf( FSPACX(130),FSPACY(172), netgame->AllowedItems & NETFLAG_DOCONVERTER?"YES":"NO");
gr_printf( FSPACX(275),FSPACY(160), netgame->AllowedItems & NETFLAG_DOINVUL?"YES":"NO");
gr_printf( FSPACX(275),FSPACY(166), netgame->AllowedItems & NETFLAG_DOCLOAK?"YES":"NO");
gr_printf( FSPACX(275),FSPACY(172), netgame->AllowedItems & NETFLAG_DOAMMORACK?"YES":"NO");
gr_string( FSPACX(275),FSPACY( 35), netgame->InvulAppear?"ON":"OFF");
gr_string( FSPACX(275),FSPACY( 41), netgame->Allow_marker_view?"ON":"OFF");
gr_string( FSPACX(275),FSPACY( 47), netgame->AlwaysLighting?"ON":"OFF");
gr_string( FSPACX(275),FSPACY( 53), netgame->BrightPlayers?"ON":"OFF");
gr_string( FSPACX(275),FSPACY( 59), netgame->ShowEnemyNames?"ON":"OFF");
gr_string( FSPACX(275),FSPACY( 65), netgame->game_flag.show_on_map?"ON":"OFF");
gr_string( FSPACX(275),FSPACY( 71), netgame->NoFriendlyFire?"ON":"OFF");
gr_string( FSPACX(130),FSPACY( 90), netgame->AllowedItems & NETFLAG_DOLASER?"YES":"NO");
gr_string( FSPACX(130),FSPACY( 96), netgame->AllowedItems & NETFLAG_DOSUPERLASER?"YES":"NO");
gr_string( FSPACX(130),FSPACY(102), netgame->AllowedItems & NETFLAG_DOQUAD?"YES":"NO");
gr_string( FSPACX(130),FSPACY(108), netgame->AllowedItems & NETFLAG_DOVULCAN?"YES":"NO");
gr_string( FSPACX(130),FSPACY(114), netgame->AllowedItems & NETFLAG_DOGAUSS?"YES":"NO");
gr_string( FSPACX(130),FSPACY(120), netgame->AllowedItems & NETFLAG_DOSPREAD?"YES":"NO");
gr_string( FSPACX(130),FSPACY(126), netgame->AllowedItems & NETFLAG_DOHELIX?"YES":"NO");
gr_string( FSPACX(130),FSPACY(132), netgame->AllowedItems & NETFLAG_DOPLASMA?"YES":"NO");
gr_string( FSPACX(130),FSPACY(138), netgame->AllowedItems & NETFLAG_DOPHOENIX?"YES":"NO");
gr_string( FSPACX(130),FSPACY(144), netgame->AllowedItems & NETFLAG_DOFUSION?"YES":"NO");
gr_string( FSPACX(130),FSPACY(150), netgame->AllowedItems & NETFLAG_DOOMEGA?"YES":"NO");
gr_string( FSPACX(275),FSPACY( 90), netgame->AllowedItems & NETFLAG_DOFLASH?"YES":"NO");
gr_string( FSPACX(275),FSPACY( 96), netgame->AllowedItems & NETFLAG_DOHOMING?"YES":"NO");
gr_string( FSPACX(275),FSPACY(102), netgame->AllowedItems & NETFLAG_DOGUIDED?"YES":"NO");
gr_string( FSPACX(275),FSPACY(108), netgame->AllowedItems & NETFLAG_DOPROXIM?"YES":"NO");
gr_string( FSPACX(275),FSPACY(114), netgame->AllowedItems & NETFLAG_DOSMARTMINE?"YES":"NO");
gr_string( FSPACX(275),FSPACY(120), netgame->AllowedItems & NETFLAG_DOSMART?"YES":"NO");
gr_string( FSPACX(275),FSPACY(126), netgame->AllowedItems & NETFLAG_DOMERCURY?"YES":"NO");
gr_string( FSPACX(275),FSPACY(132), netgame->AllowedItems & NETFLAG_DOMEGA?"YES":"NO");
gr_string( FSPACX(275),FSPACY(138), netgame->AllowedItems & NETFLAG_DOSHAKER?"YES":"NO");
gr_string( FSPACX(130),FSPACY(160), netgame->AllowedItems & NETFLAG_DOAFTERBURNER?"YES":"NO");
gr_string( FSPACX(130),FSPACY(166), netgame->AllowedItems & NETFLAG_DOHEADLIGHT?"YES":"NO");
gr_string( FSPACX(130),FSPACY(172), netgame->AllowedItems & NETFLAG_DOCONVERTER?"YES":"NO");
gr_string( FSPACX(275),FSPACY(160), netgame->AllowedItems & NETFLAG_DOINVUL?"YES":"NO");
gr_string( FSPACX(275),FSPACY(166), netgame->AllowedItems & NETFLAG_DOCLOAK?"YES":"NO");
gr_string( FSPACX(275),FSPACY(172), netgame->AllowedItems & NETFLAG_DOAMMORACK?"YES":"NO");
#endif
gr_set_current_canvas(NULL);
break;

8
similar/main/newmenu.cpp
View file

@ -1449,17 +1449,17 @@ static int newmenu_draw(window *wind, newmenu *menu)
sx=BORDERX-FSPACX(12);
if (menu->scroll_offset!=0)
gr_printf( sx, sy, UP_ARROW_MARKER );
gr_string( sx, sy, UP_ARROW_MARKER );
else
gr_printf( sx, sy, " " );
gr_string( sx, sy, " " );
sy=menu->items[menu->scroll_offset+menu->max_displayable-1].y-(((int)LINE_SPACING)*menu->scroll_offset);
sx=BORDERX-FSPACX(12);
if (menu->scroll_offset+menu->max_displayable<menu->nitems)
gr_printf( sx, sy, DOWN_ARROW_MARKER );
gr_string( sx, sy, DOWN_ARROW_MARKER );
else
gr_printf( sx, sy, " " );
gr_string( sx, sy, " " );
}

4
similar/main/titles.cpp
View file

@ -981,7 +981,7 @@ static void flash_cursor(briefing *br, int cursor_flag)
else
gr_set_fontcolor(Erase_color, -1);
gr_printf(br->text_x, br->text_y, "_" );
gr_string(br->text_x, br->text_y, "_" );
}
#define EXIT_DOOR_MAX 14
@ -1554,7 +1554,7 @@ static int briefing_handler(window *wind, d_event *event, briefing *br)
if (br->new_page || br->new_screen)
flash_cursor(br, br->flashing_cursor);
else if (br->flashing_cursor)
gr_printf(br->text_x, br->text_y, "_");
gr_string(br->text_x, br->text_y, "_");
break;
case EVENT_WINDOW_CLOSE: