qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-29 15:41:59 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/nq/source/game.c

117 lines
2.7 KiB
C
Raw Normal View History

fix up the support for -<game>
2001-02-24 06:38:01 +00:00
/*
game.c
game specific support (notably hipnotic, rogue and abyss)
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
whitespace and headers.
2001-08-29 02:12:57 +00:00
Nuke com.c. It's contents have been moved into game.c and massaged appropriately.
2011-09-11 05:55:13 +00:00
#include "QF/cvar.h"
move the api headers into include/QF and clean up (most of) the resulting mess. target specific files that I don't build won't compile yet. just put QF/ infront of the offending headers. Also move ver_check into libqfutils
2001-03-27 20:33:07 +00:00
#include "QF/qargs.h"
go back to using QFile, quakeio.h and quakefs.h
2002-08-27 07:16:28 +00:00
#include "QF/quakefs.h"
Nuke com.c. It's contents have been moved into game.c and massaged appropriately.
2011-09-11 05:55:13 +00:00
#include "QF/sys.h"
whitespace and headers.
2001-08-29 02:12:57 +00:00
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
#include "nq/include/game.h"
#include "nq/include/server.h"
fix up the support for -<game>
2001-02-24 06:38:01 +00:00
Nuke qboolean from orbit I never liked it, but with C2x coming out, it's best to handle bools properly. I haven't gone through all the uses of int as bool (I'll leave that for fixing when I encounter them), but this gets QF working with both c2x (really, gnu2x because of raw strings).
2023-06-13 09:06:11 +00:00
bool standard_quake = false;
whitespace and headers.
2001-08-29 02:12:57 +00:00
[cvar] Clean up most misinterpreted cvar types The misinterpretations were due to either the cvar not being accessed directly by the engine, but via only the callback, or the cvars were accesssed only by progs (in which case, they should be float). The remainder are a potential enum (hud gravity) and a "too hard basket" (rcon password: need to figure out how I want to handle secret strings).
2022-04-24 11:04:06 +00:00
float registered;
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
static cvar_t registered_cvar = {
.name = "registered",
.description =
"Is the game the registered version. 1 yes 0 no",
.default_value = "0",
.flags = CVAR_NONE,
[cvar] Clean up most misinterpreted cvar types The misinterpretations were due to either the cvar not being accessed directly by the engine, but via only the callback, or the cvars were accesssed only by progs (in which case, they should be float). The remainder are a potential enum (hud gravity) and a "too hard basket" (rcon password: need to figure out how I want to handle secret strings).
2022-04-24 11:04:06 +00:00
.value = { .type = &cexpr_float, .value = &registered },
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
};
char *cmdline;
static cvar_t cmdline_cvar = {
.name = "cmdline",
.description =
"None",
.default_value = "0",
.flags = CVAR_SERVERINFO,
[cvar] Clean up most misinterpreted cvar types The misinterpretations were due to either the cvar not being accessed directly by the engine, but via only the callback, or the cvars were accesssed only by progs (in which case, they should be float). The remainder are a potential enum (hud gravity) and a "too hard basket" (rcon password: need to figure out how I want to handle secret strings).
2022-04-24 11:04:06 +00:00
.value = { .type = 0, .value = &cmdline },
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
};
Nuke com.c. It's contents have been moved into game.c and massaged appropriately.
2011-09-11 05:55:13 +00:00
int static_registered = 1;
/*
Game_CheckRegistered
Looks for the pop.txt file and verifies it.
Sets the "registered" cvar.
Immediately exits out if an alternate game was attempted to be started
without being registered.
*/
static void
Game_CheckRegistered (void)
{
QFile *h;
Separate file search from loading. QFS_LoadFile (and its wrappers) now take a file handle rather than a path. This will make vpath usage a little cleaner to implement.
2014-01-23 02:57:57 +00:00
h = QFS_FOpenFile ("gfx/pop.lmp");
Nuke com.c. It's contents have been moved into game.c and massaged appropriately.
2011-09-11 05:55:13 +00:00
static_registered = 0;
if (h) {
static_registered = 1;
Qclose (h);
}
if (static_registered) {
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
Cvar_Set ("registered", "1");
Nuke com.c. It's contents have been moved into game.c and massaged appropriately.
2011-09-11 05:55:13 +00:00
Sys_Printf ("Playing registered version.\n");
}
}
Fix registered game detection. registered detection needs qfs to be initted, but qfs needs game to be inited... so move the qfs init into game init before the registered check.
2011-09-11 06:40:36 +00:00
void
[quakefs] Take in the pointer to the global hunk This is needed for cleaning up excess memsets when loading files because Hunk_RawAllocName has nonnull on its hunk pointer (as the rest of the hunk functions really should, but not just yet).
2021-12-13 00:13:39 +00:00
Game_Init (memhunk_t *hunk)
fix up the support for -<game>
2001-02-24 06:38:01 +00:00
{
Fix registered game detection. registered detection needs qfs to be initted, but qfs needs game to be inited... so move the qfs init into game init before the registered check.
2011-09-11 06:40:36 +00:00
int i;
const char *game = "nq";
whitespace and headers.
2001-08-29 02:12:57 +00:00
pull the game specific stuff out of quakefs.c in preparation for merging it
2001-03-30 00:30:38 +00:00
// FIXME: make this dependant on QF metadata in the mission packs
Clean up some FIXMEs and XXXs They seemed to be generally unnecessary. Also fixes some typos in related comments.
2022-10-15 05:40:29 +00:00
// better yet, make its actions part of the metadata and remove
// entirely
pull the game specific stuff out of quakefs.c in preparation for merging it
2001-03-30 00:30:38 +00:00
standard_quake = true;
fix nq's gamedir handling for the -hipnotic etc shortcuts
2003-05-09 21:10:59 +00:00
pull the game specific stuff out of quakefs.c in preparation for merging it
2001-03-30 00:30:38 +00:00
if ((i = COM_CheckParm ("-hipnotic"))) {
standard_quake = false;
Fix registered game detection. registered detection needs qfs to be initted, but qfs needs game to be inited... so move the qfs init into game init before the registered check.
2011-09-11 06:40:36 +00:00
game = "hipnotic";
fix nq's gamedir handling for the -hipnotic etc shortcuts
2003-05-09 21:10:59 +00:00
} else if ((i = COM_CheckParm ("-rogue"))) {
pull the game specific stuff out of quakefs.c in preparation for merging it
2001-03-30 00:30:38 +00:00
standard_quake = false;
Fix registered game detection. registered detection needs qfs to be initted, but qfs needs game to be inited... so move the qfs init into game init before the registered check.
2011-09-11 06:40:36 +00:00
game = "rogue";
fix nq's gamedir handling for the -hipnotic etc shortcuts
2003-05-09 21:10:59 +00:00
} else if ((i = COM_CheckParm ("-abyss"))) {
Fix registered game detection. registered detection needs qfs to be initted, but qfs needs game to be inited... so move the qfs init into game init before the registered check.
2011-09-11 06:40:36 +00:00
game = "abyss";
pull the game specific stuff out of quakefs.c in preparation for merging it
2001-03-30 00:30:38 +00:00
}
[quakefs] Take in the pointer to the global hunk This is needed for cleaning up excess memsets when loading files because Hunk_RawAllocName has nonnull on its hunk pointer (as the rest of the hunk functions really should, but not just yet).
2021-12-13 00:13:39 +00:00
QFS_Init (hunk, game);
patch from raorn ("Alexey I. Froloff" <sir_raorn@immo.ru>) to fix interaction between -hipnotic (etc) and -game
2005-02-14 09:08:32 +00:00
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
Cvar_Register (&registered_cvar, 0, 0);
Cvar_Register (&cmdline_cvar, Cvar_Info, &cmdline);
Fix registered game detection. registered detection needs qfs to be initted, but qfs needs game to be inited... so move the qfs init into game init before the registered check.
2011-09-11 06:40:36 +00:00
Game_CheckRegistered ();
fix up the support for -<game>
2001-02-24 06:38:01 +00:00
}
Reference in a new issue Copy permalink