diff --git a/doomclassic/doom/d_englsh.h b/doomclassic/doom/d_englsh.h index 656c80c5..8b052ab9 100644 --- a/doomclassic/doom/d_englsh.h +++ b/doomclassic/doom/d_englsh.h @@ -45,29 +45,29 @@ If you have questions concerning this license or the applicable additional terms #define PRESSKEY "press any button." #define PRESSYN "press y or n." #define QUITMSG "are you sure you want to\nquit this great game?" -#define LOADNET "you can't do load while in a net game!\n\n"PRESSKEY -#define QLOADNET "you can't quickload during a netgame!\n\n"PRESSKEY -#define QSAVESPOT "you haven't picked a quicksave slot yet!\n\n"PRESSKEY -#define SAVEDEAD "you can't save if you aren't playing!\n\n"PRESSKEY -#define QSPROMPT "quicksave over your game named\n\n'%s'?\n\n"PRESSYN -#define QLPROMPT "do you want to quickload the game named\n\n'%s'?\n\n"PRESSYN +#define LOADNET "you can't do load while in a net game!\n\n" PRESSKEY +#define QLOADNET "you can't quickload during a netgame!\n\n" PRESSKEY +#define QSAVESPOT "you haven't picked a quicksave slot yet!\n\n" PRESSKEY +#define SAVEDEAD "you can't save if you aren't playing!\n\n" PRESSKEY +#define QSPROMPT "quicksave over your game named\n\n'%s'?\n\n" PRESSYN +#define QLPROMPT "do you want to quickload the game named\n\n'%s'?\n\n" PRESSYN #define NEWGAME \ "you can't start a new game\n"\ -"while in a network game.\n\n"PRESSKEY +"while in a network game.\n\n" PRESSKEY #define NIGHTMARE \ "are you sure? this skill level\n"\ -"isn't even remotely fair.\n\n"PRESSYN +"isn't even remotely fair.\n\n" PRESSYN #define SWSTRING \ "this is the shareware version of doom.\n\n"\ -"you need to order the entire trilogy.\n\n"PRESSKEY +"you need to order the entire trilogy.\n\n" PRESSKEY #define MSGOFF "Messages OFF" #define MSGON "Messages ON" -#define NETEND "you can't end a netgame!\n\n"PRESSKEY -#define ENDGAME "are you sure you want to end the game?\n\n"PRESSYN +#define NETEND "you can't end a netgame!\n\n" PRESSKEY +#define ENDGAME "are you sure you want to end the game?\n\n" PRESSYN #define DOSY "(press A to quit)" diff --git a/doomclassic/doom/z_zone.h b/doomclassic/doom/z_zone.h index cb25ae5b..3c968981 100644 --- a/doomclassic/doom/z_zone.h +++ b/doomclassic/doom/z_zone.h @@ -103,7 +103,7 @@ typedef struct memblock_s #define Z_ChangeTag(p,t) \ { \ if (( (memblock_t *)( (byte *)(p) - sizeof(memblock_t)))->id!=0x1d4a11) \ - I_Error("Z_CT at "__FILE__":%i",__LINE__); \ + I_Error("Z_CT at " __FILE__ ":%i",__LINE__); \ Z_ChangeTag2((void**)&p,t); \ };