From: Rudolf Polzer Date: Tue, 18 Jan 2011 20:11:26 +0000 (+0100) Subject: don't compile the ctf example X-Git-Tag: xonotic-v0.5.0~318^2~15 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=c267fd5ef1296593c325b93195a5acf7c7f54653 don't compile the ctf example --- diff --git a/qcsrc/client/bgmscript.qc b/qcsrc/client/bgmscript.qc index 43255da584..353c5419ab 100644 --- a/qcsrc/client/bgmscript.qc +++ b/qcsrc/client/bgmscript.qc @@ -131,7 +131,7 @@ void BGMScript_InitEntity(entity e) e.bgmscriptline = e.bgmscriptline0 = i; if(i >= bgmscriptbufsize) { - print("ERROR: bgmscript does not define ", e.bgmscript, "\n"); + print(sprintf("ERROR: bgmscript does not define %s\n", e.bgmscript)); e.bgmscript = ""; } } @@ -182,7 +182,6 @@ float BGMScript(entity e) if(bgmtime < e.bgmscripttime) { - //print("reset ", e.bgmscript, "\n"); amp = GetCurrentAmplitude(e, e.bgmscripttime - e.bgmscriptstatetime + drawframetime); e.bgmscriptline = e.bgmscriptline0; diff --git a/qcsrc/client/ctf.qc b/qcsrc/client/ctf.qc index 0a5375f51d..651a8e62bc 100644 --- a/qcsrc/client/ctf.qc +++ b/qcsrc/client/ctf.qc @@ -1,4 +1,5 @@ -//include "main.qh" +#ifdef CTF_EXAMPLE + // NOTE: This file contains lots of debugging stuff // it is not really used... can be seen as another sample... @@ -214,3 +215,5 @@ void() ctf_view = drawstring('0 0 0', "Awaiting orders...", '8 8 0', '1 1 1', 0.5, 0); } }; + +#endif diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh index 364e5a999f..970a1aa0b7 100644 --- a/qcsrc/client/main.qh +++ b/qcsrc/client/main.qh @@ -20,8 +20,10 @@ var float(float bInputType, float nPrimary, float nSecondary) menu_action; // -------------------------------------------------------------------------- // CTF +#ifdef CTF_EXAMPLE void() ctf_menu_show; string ctf_temp_1; +#endif // -------------------------------------------------------------------------- // Onslaught diff --git a/qcsrc/i18n-guide.txt b/qcsrc/i18n-guide.txt index 4e6d70cc56..87d4ff5186 100644 --- a/qcsrc/i18n-guide.txt +++ b/qcsrc/i18n-guide.txt @@ -29,7 +29,6 @@ Unresolved TODO: - translated campaigns -client/bgmscript.qc client/casings.qc client/ctf.qc client/damage.qc