mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r2129) Reverted r2125 and depending revisions (map size selector in the intro window). Will be done in a separate dialog. This also fixes showing of various rail/road-related strings.

This commit is contained in:
pasky 2005-04-02 16:40:21 +00:00
parent bfe31c32c0
commit 8d09a1ae87
3 changed files with 19 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
intro_gui.c
View File

@ -22,40 +22,21 @@ static void ShowSelectTutorialWindow()
* a highly unusual concept, guys, but I hope you'll manage to follow. --pasky */
static const Widget _select_game_widgets[] = {
{ WWT_CAPTION, RESIZE_NONE, 13, 0, 335, 0, 13, STR_0307_OPENTTD, STR_NULL},
{ WWT_IMGBTN, RESIZE_NONE, 13, 0, 335, 14, 233, 0x0, STR_NULL},
{ WWT_IMGBTN, RESIZE_NONE, 13, 0, 335, 14, 196, 0x0, STR_NULL},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 10, 167, 22, 33, STR_0140_NEW_GAME, STR_02FB_START_A_NEW_GAME},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 168, 325, 22, 33, STR_0141_LOAD_GAME, STR_02FC_LOAD_A_SAVED_GAME},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 10, 167, 40, 51, STR_0220_CREATE_SCENARIO,STR_02FE_CREATE_A_CUSTOMIZED_GAME},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 168, 325, 40, 51, STR_029A_PLAY_SCENARIO, STR_0303_START_A_NEW_GAME_USING},
{ WWT_PANEL_2, RESIZE_NONE, 12, 10, 85, 67, 120, 0x1312, STR_030E_SELECT_TEMPERATE_LANDSCAPE},
{ WWT_PANEL_2, RESIZE_NONE, 12, 90, 165, 67, 120, 0x1314, STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE},
{ WWT_PANEL_2, RESIZE_NONE, 12, 170, 245, 67, 120, 0x1316, STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE},
{ WWT_PANEL_2, RESIZE_NONE, 12, 250, 325, 67, 120, 0x1318, STR_0311_SELECT_TOYLAND_LANDSCAPE},
/* string&0x1000 shows the number encoded in the lowest 12 bits. Using
* just dparams gives some extremely weird results, so this is after
* all the most elegant solution. --pasky */
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 10, 57, 128, 139, 0x1040, STR_MAP_WIDTH_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 64, 111, 128, 139, 0x1080, STR_MAP_WIDTH_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 117, 164, 128, 139, 0x1100, STR_MAP_WIDTH_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 171, 218, 128, 139, 0x1200, STR_MAP_WIDTH_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 224, 271, 128, 139, 0x1400, STR_MAP_WIDTH_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 278, 325, 128, 139, 0x1800, STR_MAP_WIDTH_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 10, 57, 144, 155, 0x1040, STR_MAP_HEIGHT_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 64, 111, 144, 155, 0x1080, STR_MAP_HEIGHT_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 117, 164, 144, 155, 0x1100, STR_MAP_HEIGHT_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 171, 218, 144, 155, 0x1200, STR_MAP_HEIGHT_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 224, 271, 144, 155, 0x1400, STR_MAP_HEIGHT_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 278, 325, 144, 155, 0x1800, STR_MAP_HEIGHT_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 10, 167, 173, 184, STR_SINGLE_PLAYER, STR_02FF_SELECT_SINGLE_PLAYER_GAME},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 168, 325, 173, 184, STR_MULTIPLAYER, STR_0300_SELECT_MULTIPLAYER_GAME},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 10, 167, 196, 207, STR_0148_GAME_OPTIONS, STR_0301_DISPLAY_GAME_OPTIONS},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 168, 325, 196, 207, STR_01FE_DIFFICULTY, STR_0302_DISPLAY_DIFFICULTY_OPTIONS},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 10, 167, 214, 225, STR_CONFIG_PATCHES, STR_CONFIG_PATCHES_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 168, 325, 214, 225, STR_0304_QUIT, STR_0305_QUIT_OPENTTD},
{ WWT_PANEL_2, RESIZE_NONE, 12, 10, 85, 69, 122, 0x1312, STR_030E_SELECT_TEMPERATE_LANDSCAPE},
{ WWT_PANEL_2, RESIZE_NONE, 12, 90, 165, 69, 122, 0x1314, STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE},
{ WWT_PANEL_2, RESIZE_NONE, 12, 170, 245, 69, 122, 0x1316, STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE},
{ WWT_PANEL_2, RESIZE_NONE, 12, 250, 325, 69, 122, 0x1318, STR_0311_SELECT_TOYLAND_LANDSCAPE},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 10, 167, 136, 147, STR_SINGLE_PLAYER, STR_02FF_SELECT_SINGLE_PLAYER_GAME},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 168, 325, 136, 147, STR_MULTIPLAYER, STR_0300_SELECT_MULTIPLAYER_GAME},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 10, 167, 159, 170, STR_0148_GAME_OPTIONS, STR_0301_DISPLAY_GAME_OPTIONS},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 168, 325, 159, 170, STR_01FE_DIFFICULTY, STR_0302_DISPLAY_DIFFICULTY_OPTIONS},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 10, 167, 177, 188, STR_CONFIG_PATCHES, STR_CONFIG_PATCHES_TIP},
{ WWT_PUSHTXTBTN, RESIZE_NONE, 12, 168, 325, 177, 188, STR_0304_QUIT, STR_0305_QUIT_OPENTTD},
{ WIDGETS_END },
};
@ -63,11 +44,9 @@ extern void HandleOnEditText(WindowEvent *e);
extern void HandleOnEditTextCancel(void);
static void SelectGameWndProc(Window *w, WindowEvent *e) {
switch (e->event) {
switch(e->event) {
case WE_PAINT:
w->click_state &= ~(1<<22) & ~(0xF << 6) & ~(0xFFF << 11);
w->click_state |= (1<<22) | (1 << (_opt_newgame.landscape + 6));
w->click_state |= (1 << (10 + _patches.map_x - 6)) | (1 << (16 + _patches.map_y - 6));
w->click_state = (w->click_state & ~(1<<10) & ~(0xF << 6)) | (1 << (_opt_newgame.landscape + 6)) | (1<<10);
SetDParam(0, STR_6801_EASY + _opt_newgame.diff_level);
DrawWindowWidgets(w);
break;
@ -82,15 +61,7 @@ static void SelectGameWndProc(Window *w, WindowEvent *e) {
// XXX: Useless usage of the CMD infrastructure?
DoCommandP(0, e->click.widget - 6, 0, NULL, CMD_SET_NEW_LANDSCAPE_TYPE);
break;
case 10: case 11: case 12: case 13: case 14: case 15:
_patches.map_x = 6 + e->click.widget - 10;
InvalidateWindowClasses(WC_SELECT_GAME);
break;
case 16: case 17: case 18: case 19: case 20: case 21:
_patches.map_y = 6 + e->click.widget - 16;
InvalidateWindowClasses(WC_SELECT_GAME);
break;
case 23:
case 11:
#ifdef ENABLE_NETWORK
if (!_network_available) {
ShowErrorMessage(-1, STR_NETWORK_ERR_NOTAVAILABLE, 0, 0);
@ -100,10 +71,10 @@ static void SelectGameWndProc(Window *w, WindowEvent *e) {
ShowErrorMessage(-1 ,STR_NETWORK_ERR_NOTAVAILABLE, 0, 0);
#endif
break;
case 24: ShowGameOptions(); break;
case 25: ShowGameDifficulty(); break;
case 26: ShowPatchesSelection(); break;
case 27: AskExitGame(); break;
case 12: ShowGameOptions(); break;
case 13: ShowGameDifficulty(); break;
case 14: ShowPatchesSelection(); break;
case 15: AskExitGame(); break;
}
break;
@ -114,7 +85,7 @@ static void SelectGameWndProc(Window *w, WindowEvent *e) {
}
static const WindowDesc _select_game_desc = {
WDP_CENTER, WDP_CENTER, 336, 234,
WDP_CENTER, WDP_CENTER, 336, 197,
WC_SELECT_GAME,0,
WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
_select_game_widgets,

3
lang/english.txt
View File

@ -1083,9 +1083,6 @@ STR_SUB_ARCTIC_LANDSCAPE :Sub-arctic landscape
STR_SUB_TROPICAL_LANDSCAPE :Sub-tropical landscape
STR_TOYLAND_LANDSCAPE :Toyland landscape
STR_MAP_HEIGHT_TIP :Generated map height in tiles
STR_MAP_WIDTH_TIP :Generated map width in tiles
STR_CHEATS :{WHITE}Cheats
STR_CHEATS_TIP :{BLACK}Checkboxes indicate if you have used this cheat before
STR_CHEATS_WARNING :{BLACK}Warning! You are about to betray your fellow competitors. Keep in mind that such a disgrace will be remembered for eternity.

7
strings.c
View File

@ -16,7 +16,6 @@ static char *GetSpecialTownNameString(char *buff, int ind);
static char *GetSpecialPlayerNameString(char *buff, int ind);
static char *DecodeString(char *buff, const char *str);
static char *FormatNoCommaNumber(char *buff, int32 number);
extern const char _openttd_revision[];
@ -153,12 +152,6 @@ char *GetString(char *buffr, StringID string)
return DecodeString(buffr, _screenshot_name);
}
if (string >> 12 == 1) {
// black number encoded in the string ID
*buffr++ = 31; // BLACK
return FormatNoCommaNumber(buffr, string & 0xFFF);
}
switch (tab) {
case 4:
if (index >= 0xC0) return GetSpecialTownNameString(buffr, index - 0xC0);