From d941ee83dbe88fde6034f1e72d02f5f6b33e025a Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Sun, 27 Apr 2014 08:28:16 +0000 Subject: [PATCH] revert r903 and the old conback hack commits. change the engine to load id1/quakespasm.pak for content customizations. git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@904 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Linux/CodeBlocks/QuakeSpasm.cbp | 5 - MacOSX/QuakeSpasm.xcodeproj/project.pbxproj | 10 - Misc/gray_big.bmp | Bin 983094 -> 0 bytes Misc/homedir_0.patch | 85 +- Misc/qs_pak/default.cfg | 110 + Misc/qs_pak/default.cfg.orig | 98 + Misc/{gray_big.lmp => qs_pak/gfx/conback.lmp} | Bin Misc/qs_pak/mkpak.sh | 7 + Quake/Makefile | 8 - Quake/Makefile.darwin | 8 - Quake/Makefile.w32 | 8 - Quake/Makefile.w64 | 8 - Quake/cmd.c | 14 - Quake/common.c | 86 +- Quake/common.h | 1 - Quake/conback.c | 34 - Quake/conback.h | 20481 ---------------- Quake/gl_draw.c | 62 +- Quake/id1/quakespasm.pak | Bin 0 -> 329876 bytes Windows/CodeBlocks/QuakeSpasm.cbp | 5 - Windows/VisualStudio/quakespasm.vcproj | 16 +- 21 files changed, 264 insertions(+), 20782 deletions(-) delete mode 100644 Misc/gray_big.bmp create mode 100644 Misc/qs_pak/default.cfg create mode 100644 Misc/qs_pak/default.cfg.orig rename Misc/{gray_big.lmp => qs_pak/gfx/conback.lmp} (100%) create mode 100644 Misc/qs_pak/mkpak.sh delete mode 100644 Quake/conback.c delete mode 100644 Quake/conback.h create mode 100644 Quake/id1/quakespasm.pak diff --git a/Linux/CodeBlocks/QuakeSpasm.cbp b/Linux/CodeBlocks/QuakeSpasm.cbp index ad9c7349..31eee89b 100644 --- a/Linux/CodeBlocks/QuakeSpasm.cbp +++ b/Linux/CodeBlocks/QuakeSpasm.cbp @@ -33,7 +33,6 @@ - @@ -89,10 +88,6 @@