diff --git a/reaction/cgame/make-cgame.bat b/reaction/cgame/make-cgame.bat index 792ec683..46061a7d 100644 --- a/reaction/cgame/make-cgame.bat +++ b/reaction/cgame/make-cgame.bat @@ -1,12 +1,10 @@ @echo off -REM *** TEMPORARY BATCH FILE FOR OLD SVN PATHS! - REM *** NOTE: THIS BATCH FILE IS MEANT TO BE CALLED BY make-qvm.bat! REM *** NOTE: THIS CANNOT BE RUN BY ITSELF WITHOUT %make-qvm-location% BEING DEFINED! cd vm -set cc=q3lcc.exe -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\ta_ui +set cc=q3lcc.exe -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\ui echo. @@ -77,8 +75,6 @@ REM *** This tells q3asm to generate a vanilla q3-compatible qvm, generate a .ma REM *** the resulting .qvm into "%make-qvm-location%bin\qvm\vm\cgame" (it will be called cgame.qvm), REM *** and to compile the files listed in the cgame.q3asm script located in "%make-qvm-location%cgame/cgame". -REM *** TEMPORARY BATCH FILE FOR OLD SVN PATHS! - q3asm -vq3 -m -o "%make-qvm-location%bin\qvm\vm\cgame" -f "%make-qvm-location%cgame/cgame" :quit diff --git a/reaction/game/make-game.bat b/reaction/game/make-game.bat index 912657dc..02d9f7a4 100644 --- a/reaction/game/make-game.bat +++ b/reaction/game/make-game.bat @@ -1,12 +1,10 @@ @echo off -REM *** TEMPORARY BATCH FILE FOR OLD SVN PATHS! - REM *** NOTE: THIS BATCH FILE IS MEANT TO BE CALLED BY make-qvm.bat! REM *** NOTE: THIS CANNOT BE RUN BY ITSELF WITHOUT %make-qvm-location% BEING DEFINED! cd vm -set cc=q3lcc.exe -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\ta_ui +set cc=q3lcc.exe -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\ui echo. @@ -116,8 +114,6 @@ REM *** This tells q3asm to generate a vanilla q3-compatible qvm, generate a .ma REM *** the resulting .qvm into "%make-qvm-location%bin\qvm\vm\qagame" (it will be called qagame.qvm), REM *** and to compile the files listed in the game.q3asm script located in "%make-qvm-location%game/game". -REM *** TEMPORARY BATCH FILE FOR OLD SVN PATHS! - q3asm -vq3 -m -o "%make-qvm-location%bin\qvm\vm\qagame" -f "%make-qvm-location%game/game" :quit diff --git a/reaction/make-qvm.bat b/reaction/make-qvm.bat index ff5ba6ca..7c8c7ba8 100644 --- a/reaction/make-qvm.bat +++ b/reaction/make-qvm.bat @@ -1,7 +1,7 @@ @echo off cls -REM *** Last updated: Mar 1 2009 -- TEMPORARY VERSION FOR OLD-STYLE SVN LAYOUT +REM *** Last updated: Jun 27 2009 REM *** The first part of this batch file is dedicated to checking that your QVM compiling REM *** environment is set up properly and double-checking that it is because you are an @@ -88,17 +88,17 @@ echo %zipper% echo. -REM *** Removing any previous QVM files. TEMPORARY CHANGE OF PATHS FOR OLD-STYLE SVN +REM *** Removing any previous QVM files. echo. echo *** Removing any previous QVM files. del "%make-qvm-location%bin\qvm\vm\*.map" del "%make-qvm-location%bin\qvm\vm\*.qvm" del "%make-qvm-location%cgame\vm\*.asm" del "%make-qvm-location%game\vm\*.asm" -del "%make-qvm-location%ta_ui\vm\*.asm" +del "%make-qvm-location%ui\vm\*.asm" -REM *** Generating the QVMs - TEMPORARY CHANGE OF PATHS FOR OLD-STYLE SVN +REM *** Generating the QVMs REM *** Note: Q3_UI is not used by Reaction so is not compiled or included in the source. echo. echo *** Generating the QVMs @@ -115,7 +115,7 @@ call make-game.bat cd.. echo. echo *** Generating UI... -cd "%make-qvm-location%"ta_ui +cd "%make-qvm-location%"ui call make-ui.bat cd.. diff --git a/reaction/ui/keycodes.h b/reaction/q3_ui/keycodes.h similarity index 100% rename from reaction/ui/keycodes.h rename to reaction/q3_ui/keycodes.h diff --git a/reaction/ui/menudef.h b/reaction/q3_ui/menudef.h similarity index 100% rename from reaction/ui/menudef.h rename to reaction/q3_ui/menudef.h diff --git a/reaction/ui/q3_ui.q3asm b/reaction/q3_ui/q3_ui.q3asm similarity index 100% rename from reaction/ui/q3_ui.q3asm rename to reaction/q3_ui/q3_ui.q3asm diff --git a/reaction/ui/test.c b/reaction/q3_ui/test.c similarity index 100% rename from reaction/ui/test.c rename to reaction/q3_ui/test.c diff --git a/reaction/ui/ui.q3asm b/reaction/q3_ui/ui.q3asm similarity index 100% rename from reaction/ui/ui.q3asm rename to reaction/q3_ui/ui.q3asm diff --git a/reaction/ui/ui_addbots.c b/reaction/q3_ui/ui_addbots.c similarity index 100% rename from reaction/ui/ui_addbots.c rename to reaction/q3_ui/ui_addbots.c diff --git a/reaction/ui/ui_atoms.c b/reaction/q3_ui/ui_atoms.c similarity index 100% rename from reaction/ui/ui_atoms.c rename to reaction/q3_ui/ui_atoms.c diff --git a/reaction/ui/ui_cdkey.c b/reaction/q3_ui/ui_cdkey.c similarity index 100% rename from reaction/ui/ui_cdkey.c rename to reaction/q3_ui/ui_cdkey.c diff --git a/reaction/ui/ui_cinematics.c b/reaction/q3_ui/ui_cinematics.c similarity index 100% rename from reaction/ui/ui_cinematics.c rename to reaction/q3_ui/ui_cinematics.c diff --git a/reaction/ui/ui_confirm.c b/reaction/q3_ui/ui_confirm.c similarity index 100% rename from reaction/ui/ui_confirm.c rename to reaction/q3_ui/ui_confirm.c diff --git a/reaction/ui/ui_connect.c b/reaction/q3_ui/ui_connect.c similarity index 100% rename from reaction/ui/ui_connect.c rename to reaction/q3_ui/ui_connect.c diff --git a/reaction/ui/ui_controls2.c b/reaction/q3_ui/ui_controls2.c similarity index 100% rename from reaction/ui/ui_controls2.c rename to reaction/q3_ui/ui_controls2.c diff --git a/reaction/ui/ui_credits.c b/reaction/q3_ui/ui_credits.c similarity index 100% rename from reaction/ui/ui_credits.c rename to reaction/q3_ui/ui_credits.c diff --git a/reaction/ui/ui_demo2.c b/reaction/q3_ui/ui_demo2.c similarity index 100% rename from reaction/ui/ui_demo2.c rename to reaction/q3_ui/ui_demo2.c diff --git a/reaction/ui/ui_display.c b/reaction/q3_ui/ui_display.c similarity index 100% rename from reaction/ui/ui_display.c rename to reaction/q3_ui/ui_display.c diff --git a/reaction/ui/ui_gameinfo.c b/reaction/q3_ui/ui_gameinfo.c similarity index 100% rename from reaction/ui/ui_gameinfo.c rename to reaction/q3_ui/ui_gameinfo.c diff --git a/reaction/ui/ui_ingame.c b/reaction/q3_ui/ui_ingame.c similarity index 100% rename from reaction/ui/ui_ingame.c rename to reaction/q3_ui/ui_ingame.c diff --git a/reaction/ui/ui_loadconfig.c b/reaction/q3_ui/ui_loadconfig.c similarity index 100% rename from reaction/ui/ui_loadconfig.c rename to reaction/q3_ui/ui_loadconfig.c diff --git a/reaction/ui/ui_local.h b/reaction/q3_ui/ui_local.h similarity index 100% rename from reaction/ui/ui_local.h rename to reaction/q3_ui/ui_local.h diff --git a/reaction/ui/ui_login.c b/reaction/q3_ui/ui_login.c similarity index 100% rename from reaction/ui/ui_login.c rename to reaction/q3_ui/ui_login.c diff --git a/reaction/ui/ui_main.c b/reaction/q3_ui/ui_main.c similarity index 100% rename from reaction/ui/ui_main.c rename to reaction/q3_ui/ui_main.c diff --git a/reaction/ui/ui_menu.c b/reaction/q3_ui/ui_menu.c similarity index 100% rename from reaction/ui/ui_menu.c rename to reaction/q3_ui/ui_menu.c diff --git a/reaction/ui/ui_mfield.c b/reaction/q3_ui/ui_mfield.c similarity index 100% rename from reaction/ui/ui_mfield.c rename to reaction/q3_ui/ui_mfield.c diff --git a/reaction/ui/ui_mods.c b/reaction/q3_ui/ui_mods.c similarity index 100% rename from reaction/ui/ui_mods.c rename to reaction/q3_ui/ui_mods.c diff --git a/reaction/ui/ui_network.c b/reaction/q3_ui/ui_network.c similarity index 100% rename from reaction/ui/ui_network.c rename to reaction/q3_ui/ui_network.c diff --git a/reaction/ui/ui_options.c b/reaction/q3_ui/ui_options.c similarity index 100% rename from reaction/ui/ui_options.c rename to reaction/q3_ui/ui_options.c diff --git a/reaction/ui/ui_playermodel.c b/reaction/q3_ui/ui_playermodel.c similarity index 100% rename from reaction/ui/ui_playermodel.c rename to reaction/q3_ui/ui_playermodel.c diff --git a/reaction/ui/ui_players.c b/reaction/q3_ui/ui_players.c similarity index 100% rename from reaction/ui/ui_players.c rename to reaction/q3_ui/ui_players.c diff --git a/reaction/ui/ui_playersettings.c b/reaction/q3_ui/ui_playersettings.c similarity index 100% rename from reaction/ui/ui_playersettings.c rename to reaction/q3_ui/ui_playersettings.c diff --git a/reaction/ui/ui_preferences.c b/reaction/q3_ui/ui_preferences.c similarity index 100% rename from reaction/ui/ui_preferences.c rename to reaction/q3_ui/ui_preferences.c diff --git a/reaction/ui/ui_public.h b/reaction/q3_ui/ui_public.h similarity index 100% rename from reaction/ui/ui_public.h rename to reaction/q3_ui/ui_public.h diff --git a/reaction/ui/ui_qmenu.c b/reaction/q3_ui/ui_qmenu.c similarity index 100% rename from reaction/ui/ui_qmenu.c rename to reaction/q3_ui/ui_qmenu.c diff --git a/reaction/ui/ui_rankings.c b/reaction/q3_ui/ui_rankings.c similarity index 100% rename from reaction/ui/ui_rankings.c rename to reaction/q3_ui/ui_rankings.c diff --git a/reaction/ui/ui_rankstatus.c b/reaction/q3_ui/ui_rankstatus.c similarity index 100% rename from reaction/ui/ui_rankstatus.c rename to reaction/q3_ui/ui_rankstatus.c diff --git a/reaction/ui/ui_removebots.c b/reaction/q3_ui/ui_removebots.c similarity index 100% rename from reaction/ui/ui_removebots.c rename to reaction/q3_ui/ui_removebots.c diff --git a/reaction/ui/ui_saveconfig.c b/reaction/q3_ui/ui_saveconfig.c similarity index 100% rename from reaction/ui/ui_saveconfig.c rename to reaction/q3_ui/ui_saveconfig.c diff --git a/reaction/ui/ui_serverinfo.c b/reaction/q3_ui/ui_serverinfo.c similarity index 100% rename from reaction/ui/ui_serverinfo.c rename to reaction/q3_ui/ui_serverinfo.c diff --git a/reaction/ui/ui_servers2.c b/reaction/q3_ui/ui_servers2.c similarity index 100% rename from reaction/ui/ui_servers2.c rename to reaction/q3_ui/ui_servers2.c diff --git a/reaction/ui/ui_setup.c b/reaction/q3_ui/ui_setup.c similarity index 100% rename from reaction/ui/ui_setup.c rename to reaction/q3_ui/ui_setup.c diff --git a/reaction/ui/ui_shared.c b/reaction/q3_ui/ui_shared.c similarity index 100% rename from reaction/ui/ui_shared.c rename to reaction/q3_ui/ui_shared.c diff --git a/reaction/ui/ui_shared.h b/reaction/q3_ui/ui_shared.h similarity index 100% rename from reaction/ui/ui_shared.h rename to reaction/q3_ui/ui_shared.h diff --git a/reaction/ui/ui_signup.c b/reaction/q3_ui/ui_signup.c similarity index 100% rename from reaction/ui/ui_signup.c rename to reaction/q3_ui/ui_signup.c diff --git a/reaction/ui/ui_sound.c b/reaction/q3_ui/ui_sound.c similarity index 100% rename from reaction/ui/ui_sound.c rename to reaction/q3_ui/ui_sound.c diff --git a/reaction/ui/ui_sparena.c b/reaction/q3_ui/ui_sparena.c similarity index 100% rename from reaction/ui/ui_sparena.c rename to reaction/q3_ui/ui_sparena.c diff --git a/reaction/ui/ui_specifyleague.c b/reaction/q3_ui/ui_specifyleague.c similarity index 100% rename from reaction/ui/ui_specifyleague.c rename to reaction/q3_ui/ui_specifyleague.c diff --git a/reaction/ui/ui_specifyserver.c b/reaction/q3_ui/ui_specifyserver.c similarity index 100% rename from reaction/ui/ui_specifyserver.c rename to reaction/q3_ui/ui_specifyserver.c diff --git a/reaction/ui/ui_splevel.c b/reaction/q3_ui/ui_splevel.c similarity index 100% rename from reaction/ui/ui_splevel.c rename to reaction/q3_ui/ui_splevel.c diff --git a/reaction/ui/ui_sppostgame.c b/reaction/q3_ui/ui_sppostgame.c similarity index 100% rename from reaction/ui/ui_sppostgame.c rename to reaction/q3_ui/ui_sppostgame.c diff --git a/reaction/ui/ui_spreset.c b/reaction/q3_ui/ui_spreset.c similarity index 100% rename from reaction/ui/ui_spreset.c rename to reaction/q3_ui/ui_spreset.c diff --git a/reaction/ui/ui_spskill.c b/reaction/q3_ui/ui_spskill.c similarity index 100% rename from reaction/ui/ui_spskill.c rename to reaction/q3_ui/ui_spskill.c diff --git a/reaction/ui/ui_startserver.c b/reaction/q3_ui/ui_startserver.c similarity index 100% rename from reaction/ui/ui_startserver.c rename to reaction/q3_ui/ui_startserver.c diff --git a/reaction/ui/ui_syscalls.asm b/reaction/q3_ui/ui_syscalls.asm similarity index 100% rename from reaction/ui/ui_syscalls.asm rename to reaction/q3_ui/ui_syscalls.asm diff --git a/reaction/ui/ui_syscalls.c b/reaction/q3_ui/ui_syscalls.c similarity index 100% rename from reaction/ui/ui_syscalls.c rename to reaction/q3_ui/ui_syscalls.c diff --git a/reaction/ui/ui_team.c b/reaction/q3_ui/ui_team.c similarity index 100% rename from reaction/ui/ui_team.c rename to reaction/q3_ui/ui_team.c diff --git a/reaction/ui/ui_teamorders.c b/reaction/q3_ui/ui_teamorders.c similarity index 100% rename from reaction/ui/ui_teamorders.c rename to reaction/q3_ui/ui_teamorders.c diff --git a/reaction/ui/ui_video.c b/reaction/q3_ui/ui_video.c similarity index 100% rename from reaction/ui/ui_video.c rename to reaction/q3_ui/ui_video.c diff --git a/reaction/ta_ui/make-ui.bat b/reaction/ta_ui/make-ui.bat index 76d0c11d..d71a6348 100644 --- a/reaction/ta_ui/make-ui.bat +++ b/reaction/ta_ui/make-ui.bat @@ -1,12 +1,10 @@ @echo off -REM *** TEMPORARY BATCH FILE FOR OLD SVN PATHS! - REM *** NOTE: THIS BATCH FILE IS MEANT TO BE CALLED BY make-qvm.bat! REM *** NOTE: THIS CANNOT BE RUN BY ITSELF WITHOUT %make-qvm-location% BEING DEFINED! cd vm -set cc=q3lcc.exe -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\ta_ui +set cc=q3lcc.exe -DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\..\cgame -I..\..\game -I..\..\ui echo. @@ -38,11 +36,9 @@ echo *** Running Q3ASM for UI... REM *** This tells q3asm to generate a vanilla q3-compatible qvm, generate a .map file, output REM *** the resulting .qvm into "%make-qvm-location%bin\qvm\vm\ui" (it will be called ui.qvm), -REM *** and to compile the files listed in the ui.q3asm script located in "%make-qvm-location%ta_ui/ui". +REM *** and to compile the files listed in the ui.q3asm script located in "%make-qvm-location%ui/ui". -REM *** TEMPORARY BATCH FILE FOR OLD SVN PATHS! - -q3asm -vq3 -m -o "%make-qvm-location%bin\qvm\vm\ui" -f "%make-qvm-location%ta_ui/ui" +q3asm -vq3 -m -o "%make-qvm-location%bin\qvm\vm\ui" -f "%make-qvm-location%ui/ui" :quit if errorlevel 1 (