ubergames/rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/rpgxEF.git synced 2025-04-19 07:21:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Made game compile as C++ and fixed all warnings

Browse source
This commit is contained in:
Walter Julius Hennecke 2017-04-06 21:57:31 +02:00
parent e745657bdb
commit 6ef92d2d05
53 changed files with 5401 additions and 5192 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -167,3 +167,4 @@ pip-log.txt
# Mac crap
.DS_Store
/misc/msvc10/.vs/ioq3/v15

1009
code/cgame/cgame.vcxproj
View file

File diff suppressed because it is too large Load diff

6
code/game/ai_dmq3.c
View file

@ -787,7 +787,7 @@ BotIsDead
==================
*/
qboolean BotIsDead(bot_state_t *bs) {
return (bs->cur_ps.pm_type == PM_DEAD);
return qboolean(bs->cur_ps.pm_type == PM_DEAD);
}
/*
@ -811,7 +811,7 @@ BotIntermission
qboolean BotIntermission(bot_state_t *bs) {
//NOTE: we shouldn't be looking at the game code...
if (level.intermissiontime) return qtrue;
return (bs->cur_ps.pm_type == PM_FREEZE || bs->cur_ps.pm_type == PM_INTERMISSION);
return qboolean(bs->cur_ps.pm_type == PM_FREEZE || bs->cur_ps.pm_type == PM_INTERMISSION);
}
/*
@ -824,7 +824,7 @@ qboolean BotInLavaOrSlime(bot_state_t *bs) {
VectorCopy(bs->origin, feet);
feet[2] -= 23;
return (trap_AAS_PointContents(feet) & (CONTENTS_LAVA|CONTENTS_SLIME));
return qboolean(trap_AAS_PointContents(feet) & (CONTENTS_LAVA|CONTENTS_SLIME));
}
/*

10
code/game/ai_dmq3.h
View file

@ -19,11 +19,11 @@
#ifndef AI_DMQ3_H_
#define AI_DMQ3_H_
#ifdef _MSC_VER
#include <stddef.h>
#include <stdint.h>
#else
#include <stdint.h>
#ifdef _MSC_VER
#include <stddef.h>
#include <stdint.h>
#else
#include <stdint.h>
#endif
//!setup the deathmatch AI

7
code/game/ai_main.c
View file

@ -36,6 +36,7 @@
#include "chars.h"
#include "inv.h"
#include "syn.h"
#include "q_math.h"
#include "g_syscalls.h"
@ -676,7 +677,7 @@ static void AI_main_BotChangeViewAngles(bot_state_t* bs, double thinktime) {
maxchange *= thinktime;
for (; i < 2; i++) {
//smooth slowdown view model
diff = abs(AngleDifference(bs->viewangles[i], bs->ideal_viewangles[i]));
diff = Q_fabs(AngleDifference(bs->viewangles[i], bs->ideal_viewangles[i]));
anglespeed = diff * factor;
if (anglespeed > maxchange) {
anglespeed = maxchange;
@ -786,7 +787,7 @@ static void AI_main_BotInputToUserCommand(bot_input_t* bi, usercmd_t* ucmd, int3
//set the view independent movement
ucmd->forwardmove = DotProduct(forward, bi->dir) * bi->speed;
ucmd->rightmove = DotProduct(right, bi->dir) * bi->speed;
ucmd->upmove = abs(forward[2]) * bi->dir[2] * bi->speed;
ucmd->upmove = Q_fabs(forward[2]) * bi->dir[2] * bi->speed;
//normal keyboard movement
if ((bi->actionflags & ACTION_MOVEFORWARD) != 0) {
@ -995,7 +996,7 @@ int32_t AI_main_BotAISetupClient(int32_t client, struct bot_settings_s* settings
int32_t errnum = 0;
if (botstates[client] == NULL) {
botstates[client] = G_Alloc(sizeof(bot_state_t));
botstates[client] = static_cast<bot_state_t*>(G_Alloc(sizeof(bot_state_t)));
}
bs = botstates[client];

8
code/game/ai_team.c
View file

@ -106,18 +106,18 @@ int BotSortTeamMatesByBaseTravelTime(bot_state_t *bs, int *teammates, int maxtea
int i, j, k, numteammates, traveltime;
char buf[MAX_INFO_STRING];
static int maxclients;
static int maxclients1;
int traveltimes[MAX_CLIENTS];
bot_goal_t *goal;
if (BotCTFTeam(bs) == CTF_TEAM_RED) goal = &ctf_redflag;
else goal = &ctf_blueflag;
if (!maxclients)
maxclients = trap_Cvar_VariableIntegerValue("sv_maxclients");
if (!maxclients1)
maxclients1 = trap_Cvar_VariableIntegerValue("sv_maxclients");
numteammates = 0;
for (i = 0; i < maxclients && i < MAX_CLIENTS; i++) {
for (i = 0; i < maxclients1 && i < MAX_CLIENTS; i++) {
trap_GetConfigstring(CS_PLAYERS+i, buf, sizeof(buf));
//if no config string or no name
if (!strlen(buf) || !strlen(Info_ValueForKey(buf, "n"))) continue;

2
code/game/bg_collision.c
View file

@ -5,7 +5,7 @@
#define QUADRANT_RIGHT 1
#define QUADRANT_MIDDLE 2
qboolean BG_LineBoxIntersection(vec3_t mins, vec3_t maxs, vec3_t origin, vec3_t dir, vec_t* hit) {
qboolean inside;
qboolean inside = qfalse;
char quadrant[3];
int i;
int plane;

4887
code/game/bg_lex.yy.c → code/game/bg_lex.flex.cpp
View file

File diff suppressed because it is too large Load diff

19
code/game/bg_lex.lex → code/game/bg_lex.l
View file

@ -1,11 +1,21 @@
%top {
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4005)
#endif
#include "q_shared.h"
#include "bg_lex.h"
#define YY_FATAL_ERROR(msg) bgLexFatalError(msg, yyscanner)
#define UNUSED(x) ((void)(x))
#pragma warning(disable:4505)
}
%option nounput
DIGIT [0-9]
INT "-"?{DIGIT}+
DOUBLE "-"?{DIGIT}+"."?{DIGIT}*
@ -744,11 +754,7 @@ int main(int argc, char* argv[]) {
#endif
bgLex* bgLex_create(char* data) {
bgLex* l = malloc(sizeof(bgLex));
/* HACK: prevent compiler warnings */
UNUSED(yyunput);
UNUSED(input);
bgLex* l = static_cast<bgLex*>(malloc(sizeof(bgLex)));
if(l != NULL) {
l->morphem.line = 0;
@ -767,7 +773,7 @@ void bgLex_destroy(bgLex* lex) {
}
if(lex->buf != NULL) {
yy_delete_buffer(lex->buf, lex->lex);
yy_delete_buffer(static_cast<YY_BUFFER_STATE>(lex->buf), lex->lex);
}
if(lex->lex != NULL) {
@ -1155,3 +1161,4 @@ void bgLexFatalError(const char* msg, void* lex) {
Com_Printf("LEXER ERROR: %s\n", msg);
}

2
code/game/bg_list.h
View file

@ -67,7 +67,7 @@ struct container {
size_t size; /*!< size of the data */
dataType_t type; /*!< type of the data */
char pointer; /*!< determin if the data is a pointer */
} container;
};
/**
* Type for a pointer to a container.

2
code/game/bg_misc.c
View file

@ -92,7 +92,7 @@ gitem_t bg_itemlist[] =
NULL, /* char *icon;*/
NULL, /* char *pickup_name; */ /* for printing on pickup */
0, /* int quantity; */ /* for ammo how much, or duration of powerup */
0, /* itemType_t giType; */ /* IT_* flags */
itemType_t(0), /* itemType_t giType; */ /* IT_* flags */
0, /* int giTag; */
"", /* char *precaches; */ /* string of all models and images this item will use */
"" /* char *sounds; */ /* string of all sounds this item will use */

60
code/game/bg_pmove.c
View file

@ -816,7 +816,7 @@ static void PM_ContinueLegsAnim(int anim, qboolean overrideEmote) {
//override to return to idle after moving in an emote
if ((ps->stats[EMOTES] & EMOTE_LOWER) && (!(ps->stats[EMOTES] & EMOTE_CLAMP_BODY) && !(ps->stats[EMOTES] & EMOTE_CLAMP_ALL)) && !overrideEmote) {
if (ps->legsTimer > 0 && (ps->stats[LEGSANIM] & ~ANIM_TOGGLEBIT) != bg_emoteList[ps->legsTimer].enumName && (ps->stats[LEGSANIM] & ~ANIM_TOGGLEBIT) != BOTH_GET_UP1) {
int anim2 = PM_GetAnim(ANIM_IDLE, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse);
int anim2 = PM_GetAnim(ANIM_IDLE, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse);
ps->stats[LEGSANIM] = ((ps->stats[LEGSANIM] & ANIM_TOGGLEBIT) ^ ANIM_TOGGLEBIT) | anim2;
}
@ -1163,15 +1163,15 @@ static qboolean PM_CheckJump(void) {
PM_AddEvent(EV_JUMP);
if (pm->cmd.forwardmove >= 0) {
PM_ForceLegsAnim(PM_GetAnim(ANIM_JUMP, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse)); //BOTH_JUMP
PM_ForceLegsAnim(PM_GetAnim(ANIM_JUMP, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse)); //BOTH_JUMP
if (ps->weaponstate == WEAPON_READY)
PM_ForceTorsoAnim(PM_GetAnim(ANIM_JUMP, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qtrue);
PM_ForceTorsoAnim(PM_GetAnim(ANIM_JUMP, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qtrue);
ps->pm_flags &= ~PMF_BACKWARDS_JUMP;
}
else {
if (ps->weaponstate == WEAPON_READY)
PM_ForceTorsoAnim(PM_GetAnim(ANIM_JUMPB, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse), qtrue);
PM_ForceLegsAnim(PM_GetAnim(ANIM_JUMPB, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue)); //LEGS_JUMPB
PM_ForceTorsoAnim(PM_GetAnim(ANIM_JUMPB, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse), qtrue);
PM_ForceLegsAnim(PM_GetAnim(ANIM_JUMPB, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue)); //LEGS_JUMPB
ps->pm_flags |= PMF_BACKWARDS_JUMP;
}
@ -1412,8 +1412,8 @@ static void PM_FlyMove(void) {
PM_Accelerate(wishdir, wishspeed, pm_flyaccelerate);
if (ps->weaponstate == WEAPON_READY)
PM_ContinueTorsoAnim(PM_GetAnim(ANIM_FLY, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qfalse);
PM_ContinueLegsAnim(PM_GetAnim(ANIM_FLY, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse), qtrue);
PM_ContinueTorsoAnim(PM_GetAnim(ANIM_FLY, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qfalse);
PM_ContinueLegsAnim(PM_GetAnim(ANIM_FLY, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse), qtrue);
PM_StepSlideMove(qfalse);
}
@ -1987,15 +1987,15 @@ static void PM_GroundTraceMissed(void) {
pm->trace(&trace, ps->origin, pm->mins, pm->maxs, point, ps->clientNum, pm->tracemask);
if (trace.fraction == 1.0 && (ps->stats[LEGSANIM] & ~ANIM_TOGGLEBIT) != BOTH_GET_UP1) {
if (pm->cmd.forwardmove >= 0) {
PM_ForceLegsAnim(PM_GetAnim(ANIM_JUMP, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse));
PM_ForceLegsAnim(PM_GetAnim(ANIM_JUMP, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse));
if (ps->weaponstate == WEAPON_READY)
PM_ForceTorsoAnim(PM_GetAnim(ANIM_JUMP, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qtrue);
PM_ForceTorsoAnim(PM_GetAnim(ANIM_JUMP, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qtrue);
ps->pm_flags &= ~PMF_BACKWARDS_JUMP;
}
else {
PM_ForceLegsAnim(PM_GetAnim(ANIM_JUMPB, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse));
PM_ForceLegsAnim(PM_GetAnim(ANIM_JUMPB, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse));
if (ps->weaponstate == WEAPON_READY)
PM_ForceTorsoAnim(PM_GetAnim(ANIM_JUMPB, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qtrue);
PM_ForceTorsoAnim(PM_GetAnim(ANIM_JUMPB, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qtrue);
ps->pm_flags |= PMF_BACKWARDS_JUMP;
}
@ -2049,15 +2049,15 @@ static void PM_GroundTrace(void) {
}
// go into jump animation
if (pm->cmd.forwardmove >= 0) {
PM_ForceLegsAnim(PM_GetAnim(ANIM_JUMP, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse));
PM_ForceLegsAnim(PM_GetAnim(ANIM_JUMP, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse));
if (ps->weaponstate == WEAPON_READY)
PM_ForceTorsoAnim(PM_GetAnim(ANIM_JUMP, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qtrue);
PM_ForceTorsoAnim(PM_GetAnim(ANIM_JUMP, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qtrue);
ps->pm_flags &= ~PMF_BACKWARDS_JUMP;
}
else {
PM_ForceLegsAnim(PM_GetAnim(ANIM_JUMPB, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse));
PM_ForceLegsAnim(PM_GetAnim(ANIM_JUMPB, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse));
if (ps->weaponstate == WEAPON_READY)
PM_ForceTorsoAnim(PM_GetAnim(ANIM_JUMPB, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qtrue);
PM_ForceTorsoAnim(PM_GetAnim(ANIM_JUMPB, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qtrue);
ps->pm_flags |= PMF_BACKWARDS_JUMP;
}
@ -2386,8 +2386,8 @@ static void PM_Footsteps(void) {
// airborne leaves position in cycle intact, but doesn't advance
if (pm->waterlevel > 2) { //TiM: swimming is more hardcore now //1
if (ps->weaponstate == WEAPON_READY)
PM_ContinueTorsoAnim(PM_GetAnim(ANIM_SWIM, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qtrue);
PM_ContinueLegsAnim(PM_GetAnim(ANIM_SWIM, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse), qtrue);
PM_ContinueTorsoAnim(PM_GetAnim(ANIM_SWIM, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qtrue);
PM_ContinueLegsAnim(PM_GetAnim(ANIM_SWIM, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse), qtrue);
}
return;
@ -2447,10 +2447,10 @@ static void PM_Footsteps(void) {
bobmove = 0.5; // ducked characters bob much faster
//HACK coz this damn thing screws up crouch firing anims otherwise T_T
if (ps->weaponstate == WEAPON_READY) {
PM_ContinueTorsoAnim(PM_GetAnim(ANIM_CROUCHWALK, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qfalse);
PM_ContinueTorsoAnim(PM_GetAnim(ANIM_CROUCHWALK, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qfalse);
}
PM_ContinueLegsAnim(PM_GetAnim(ANIM_CROUCHWALK, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse), qtrue);
PM_ContinueLegsAnim(PM_GetAnim(ANIM_CROUCHWALK, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse), qtrue);
// ducked characters never play footsteps
}
else if (ps->pm_flags & PMF_BACKWARDS_RUN)
@ -2460,15 +2460,15 @@ static void PM_Footsteps(void) {
footstep = qtrue;
if (ps->weaponstate == WEAPON_READY)
PM_ContinueTorsoAnim(PM_GetAnim(ANIM_RUNB, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qfalse);
PM_ContinueLegsAnim(PM_GetAnim(ANIM_RUNB, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse), qtrue); //LEGS_BACK
PM_ContinueTorsoAnim(PM_GetAnim(ANIM_RUNB, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qfalse);
PM_ContinueLegsAnim(PM_GetAnim(ANIM_RUNB, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse), qtrue); //LEGS_BACK
}
else {
bobmove = 0.3;
if (ps->weaponstate == WEAPON_READY)
PM_ContinueTorsoAnim(PM_GetAnim(ANIM_WALKB, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qfalse);
PM_ContinueLegsAnim(PM_GetAnim(ANIM_WALKB, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse), qtrue); //LEGS_BACK
PM_ContinueTorsoAnim(PM_GetAnim(ANIM_WALKB, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qfalse);
PM_ContinueLegsAnim(PM_GetAnim(ANIM_WALKB, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse), qtrue); //LEGS_BACK
}
}
@ -2479,16 +2479,16 @@ static void PM_Footsteps(void) {
footstep = qtrue;
if (ps->weaponstate == WEAPON_READY)
PM_ContinueTorsoAnim(PM_GetAnim(ANIM_RUN, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qfalse);
PM_ContinueLegsAnim(PM_GetAnim(ANIM_RUN, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse), qtrue); //LEGS_RUN
PM_ContinueTorsoAnim(PM_GetAnim(ANIM_RUN, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qfalse);
PM_ContinueLegsAnim(PM_GetAnim(ANIM_RUN, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse), qtrue); //LEGS_RUN
}
else {
bobmove = 0.3; // walking bobs slow //0.3
if (ps->weaponstate == WEAPON_READY)
PM_ContinueTorsoAnim(PM_GetAnim(ANIM_WALK, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qfalse);
PM_ContinueTorsoAnim(PM_GetAnim(ANIM_WALK, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qfalse);
PM_ContinueLegsAnim(PM_GetAnim(ANIM_WALK, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse), qtrue); //LEGS_WALK
PM_ContinueLegsAnim(PM_GetAnim(ANIM_WALK, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qfalse), qtrue); //LEGS_WALK
}
}
@ -2746,7 +2746,7 @@ static void PM_Weapon(void) {
{
ps->weaponstate = WEAPON_READY;
PM_StartTorsoAnim(PM_GetAnim(ANIM_IDLE, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qfalse);
PM_StartTorsoAnim(PM_GetAnim(ANIM_IDLE, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qfalse);
return;
}
@ -2789,11 +2789,11 @@ static void PM_Weapon(void) {
|| (ps->weapon == WP_7))
&& (ps->pm_flags & PMF_DUCKED))
{
PM_ForceTorsoAnim(PM_GetAnim(ANIM_CROUCH, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qfalse);
PM_ForceTorsoAnim(PM_GetAnim(ANIM_CROUCH, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qfalse);
}
else
{
PM_ContinueTorsoAnim(PM_GetAnim(ANIM_ATTACK, ps->weapon, (ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qfalse);
PM_ContinueTorsoAnim(PM_GetAnim(ANIM_ATTACK, ps->weapon, qboolean(ps->stats[STAT_HEALTH] <= INJURED_MODE_HEALTH), qtrue), qfalse);
}
//Put in this scope, so holding down the trigger on these 'no-anim' weapons won't lock

2
code/game/bg_public.h
View file

@ -37,7 +37,7 @@ static const double PIERCED_ARMOR_PROTECTION = 0.50; //!< trek: shields only sto
static const uint32_t RANK_TIED_FLAG = 0x4000;
static const uint32_t ITEM_RADIUS = 15; //!< item sizes are needed for client side pickup detection
static const int32_t ITEM_RADIUS = 15; //!< item sizes are needed for client side pickup detection
static const uint32_t LIGHTNING_RANGE = 768;

2
code/game/bg_slidemove.c
View file

@ -203,7 +203,7 @@ qboolean PM_SlideMove( qboolean gravity ) {
VectorCopy( primal_velocity, ps->velocity );
}
return ( bumpcount != 0 );
return qboolean( bumpcount != 0 );
}
/*

4
code/game/g_active.c
View file

@ -531,7 +531,7 @@ static char *TimedMessage(void){
}
c = level.timedMessages->cycl_next(level.iterTimedMessages);
message = c->data;
message = static_cast<char*>(c->data);
return message;
}
@ -1850,7 +1850,7 @@ void G_ThrowWeapon(gentity_t *ent, char *txt)
numTotalDropped++;
item = BG_FindItemForWeapon(ps->weapon);
item = BG_FindItemForWeapon(weapon_t(ps->weapon));
// admins don't lose weapon when thrown
if (G_Client_IsAdmin(ent) == qfalse) {

4
code/game/g_bot.c
View file

@ -88,7 +88,7 @@ int32_t G_ParseInfos(char* buf, int32_t max, char* infos[]) {
Info_SetValueForKey(info, key, token);
}
//NOTE: extra space for arena number
infos[count] = G_Alloc(strlen(info) + strlen("\\num\\") + strlen(va("%d", MAX_ARENAS)) + 1);
infos[count] = (char*)G_Alloc(strlen(info) + strlen("\\num\\") + strlen(va("%d", MAX_ARENAS)) + 1);
if (infos[count] != NULL) {
strcpy(infos[count], info);
count++;
@ -722,7 +722,7 @@ static void G_AddBot(const char* name, double skill, const char* team, const cha
if (bot->client->sess.sessionTeam == TEAM_SPECTATOR)
{
bot->client->sess.sessionTeam = preTeam;
bot->client->sess.sessionTeam = team_t(preTeam);
}
if (bot->client->sess.sessionTeam == TEAM_RED)

10
code/game/g_client.c
View file

@ -757,12 +757,12 @@ static void randomSkin(const char* race, char* model, int32_t current_team, int3
memset(temp_model, 0, sizeof(temp_model));
skinsForRace = malloc(MAX_SKINS_FOR_RACE * 128 * sizeof(char));
skinsForRace = (char**)malloc(MAX_SKINS_FOR_RACE * 128 * sizeof(char));
if (skinsForRace == NULL) {
G_Error("Was unable to allocate %i bytes.\n", MAX_SKINS_FOR_RACE * 128 * sizeof(char));
return;
}
skinNamesAlreadyUsed = malloc(16 * 128 * sizeof(char));
skinNamesAlreadyUsed = (char**)malloc(16 * 128 * sizeof(char));
if (skinNamesAlreadyUsed == NULL) {
G_Error("Was unable to allocate %i bytes.\n", 16 * 128 * sizeof(char));
return;
@ -795,7 +795,7 @@ static void randomSkin(const char* race, char* model, int32_t current_team, int3
// no, so look at the next one, and see if it's in the list we are constructing
// same team?
if (ent->client != NULL && ent->client->sess.sessionTeam == current_team) {
userinfo = malloc(MAX_INFO_STRING * sizeof(char));
userinfo = (char*)malloc(MAX_INFO_STRING * sizeof(char));
if (userinfo == NULL) {
G_Error("Was unable to allocate %i bytes.\n", MAX_INFO_STRING * sizeof(char));
return;
@ -1314,7 +1314,7 @@ char* G_Client_Connect(int32_t clientNum, qboolean firstTime, qboolean isBot) {
if (isBot) {
ent->r.svFlags |= SVF_BOT;
ent->inuse = qtrue;
if (!G_BotConnect(clientNum, !firstTime)) {
if (!G_BotConnect(clientNum, qboolean(!firstTime))) {
return "BotConnectfailed";
}
}
@ -2910,7 +2910,7 @@ void G_Client_TossClientItems(gentity_t* self, qboolean dis_con) {
angle = 45;
for (i = 1; i < PW_NUM_POWERUPS; i++) {
if (ps->powerups[i] > level.time) {
item = BG_FindItemForPowerup(i);
item = BG_FindItemForPowerup(powerup_t(i));
if (item == NULL) {
continue;
}

10
code/game/g_cmds.c
View file

@ -1064,7 +1064,7 @@ static void Cmd_Team_f(gentity_t* ent) {
// check and save if this player has already voted
voted = ent->client->ps.eFlags & EF_VOTED;
voted = qboolean(ent->client->ps.eFlags & EF_VOTED);
//if this is a manual change, not an assimilation, uninitialize the clInitStatus data
SetTeam(ent, s);
@ -6651,7 +6651,7 @@ static void Cmd_getEntByTarget_f(gentity_t* ent) {
iter = entities.iterator(&entities, LIST_FRONT);
for (c = entities.next(iter); c != NULL; c = entities.next(iter)) {
t = c->data;
t = (gentity_t*)c->data;
if (t == NULL) {
continue;
@ -7776,7 +7776,7 @@ static void Cmd_findEntitiesInRadius(gentity_t* ent) {
iter = entities.iterator(&entities, LIST_FRONT);
for (c = entities.next(iter); c != NULL; c = entities.next(iter)) {
t = c->data;
t = (gentity_t*)c->data;
if (t == NULL) {
continue;
@ -7877,7 +7877,7 @@ void addShaderToList(list_p list, char* shader) {
}
for (c = list->next(i); c != NULL; c = list->next(i)) {
t = c->data;
t = (char*)c->data;
if (!strcmp(shader, t)) {
free(s);
return;
@ -7952,7 +7952,7 @@ void Cmd_GeneratePrecacheFile(gentity_t* ent) {
}
for (c = shaders->next(iter); c != NULL; c = shaders->next(iter)) {
s = c->data;
s = (char*)c->data;
G_Printf("\t%s\n", s);
if (first) {
trap_FS_Write("\"", 1, f);

2
code/game/g_combat.c
View file

@ -220,7 +220,7 @@ static int32_t G_Combat_LocationDamage(vec3_t point, gentity_t* targ, gentity_t*
}
// Check the location ignoring the rotation info
switch ((targ->client->lasthurt_location & ~(LOCATION_BACK | LOCATION_LEFT | LOCATION_RIGHT | LOCATION_FRONT)) != 0) {
switch (targ->client->lasthurt_location & ~(LOCATION_BACK | LOCATION_LEFT | LOCATION_RIGHT | LOCATION_FRONT)) {
case LOCATION_HEAD:
take *= 1.8;
break;

2
code/game/g_local.h
View file

@ -2174,7 +2174,7 @@ struct luaAlertState_s {
char* targets[4];
};
luaAlertState_t* luaAlertState;
extern luaAlertState_t* luaAlertState;
/* alert shaders */
typedef struct {

12
code/game/g_logger.c
View file

@ -1,10 +1,10 @@
#include "g_logger.h"
void QDECL G_Logger (int level, char* fmt, ...) {
void QDECL G_Logger (int log_level, char* fmt, ...) {
va_list argptr;
char text[1024];
if(level > g_logLevel.integer) {
if(log_level > g_logLevel.integer) {
return;
}
@ -12,7 +12,7 @@ void QDECL G_Logger (int level, char* fmt, ...) {
vsnprintf (text, sizeof(text), fmt, argptr);
va_end (argptr);
switch (level)
switch (log_level)
{
case LL_ERROR:
G_Printf(S_COLOR_RED "[game][error] - %s", text);
@ -40,11 +40,11 @@ void QDECL G_Logger (int level, char* fmt, ...) {
}
}
void QDECL _G_LocLogger (const char* file, int line, int level, char* fmt, ...) {
void QDECL _G_LocLogger (const char* file, int line, int log_level, char* fmt, ...) {
va_list argptr;
char text[1024];
if(level > g_logLevel.integer) {
if(log_level > g_logLevel.integer) {
return;
}
@ -52,7 +52,7 @@ void QDECL _G_LocLogger (const char* file, int line, int level, char* fmt, ...)
vsnprintf (text, sizeof(text), fmt, argptr);
va_end (argptr);
switch (level)
switch (log_level)
{
case LL_ERROR:
G_Printf(S_COLOR_RED "[game][error][%s:%d] - ", file, line);

5
code/game/g_main.c
View file

@ -20,6 +20,7 @@
#include "g_syscalls.h"
// pre declare ai functions
luaAlertState_t* luaAlertState;
extern int32_t AI_main_BotAIStartFrame(int32_t time);
extern int32_t AI_main_BotAISetup(int32_t restart);
extern int32_t AI_main_BotAIShutdown(int32_t restart);
@ -1108,7 +1109,7 @@ static void G_LoadServerChangeFile(void) {
}
// TODO dynamic buffer size
buffer = malloc((file_len + 1) * sizeof(char));
buffer = (char*)malloc((file_len + 1) * sizeof(char));
if (buffer == NULL) {
G_LocLogger(LL_ERROR, "Was unable to allocate %i bytes.\n", (file_len + 1) * sizeof(char));
trap_FS_FCloseFile(f);
@ -1332,7 +1333,7 @@ static void G_LoadLocationsFile(void) {
memset(fileRoute, 0, sizeof(fileRoute));
memset(mapRoute, 0, sizeof(mapRoute));
serverInfo = malloc(MAX_INFO_STRING * sizeof(char));
serverInfo = (char*)malloc(MAX_INFO_STRING * sizeof(char));
if (serverInfo == NULL) {
G_LocLogger(LL_ERROR, "Was unable to allocate %i bytes.\n", MAX_INFO_STRING * sizeof(char));
G_LogFuncEnd();

19
code/game/g_mover.c
View file

@ -3541,16 +3541,15 @@ will be called when the entity is used
void use_stasis_door(gentity_t *ent, gentity_t *other, gentity_t *activator)
{
return;
if (!Q_stricmp(activator->target, ent->targetname))
{
ent->think = toggle_stasis_door;
ent->nextthink = level.time + 50;
}
else if (!Q_stricmp(activator->target, ent->swapname))
{
ent->nextthink = level.time + 100;
}
//if (!Q_stricmp(activator->target, ent->targetname))
//{
// ent->think = toggle_stasis_door;
// ent->nextthink = level.time + 50;
//}
//else if (!Q_stricmp(activator->target, ent->swapname))
//{
// ent->nextthink = level.time + 100;
//}
}
/*
-------------------------------------------

3
code/game/g_sql.c
View file

@ -503,9 +503,6 @@ qboolean G_Sql_UserDB_CheckRight(int uid, int right) {
sqlite3_finalize(stmt);
return qfalse;
}
sqlite3_finalize(stmt);
return qfalse;
}
qboolean G_Sql_UserDB_AddRight(int uid, int right) {

2
code/game/g_target.c
View file

@ -3044,7 +3044,7 @@ void target_selfdestruct_think(gentity_t *ent) {
}
//we may go this way once more so clear clients back.
client = NULL;
while((client = G_Find( client, FOFS( classname ), "player" ))){
while((client = G_Find( client, FOFS( classname ), "player" )) != nullptr){
client->client->nokilli = 0;
}
//let's hear it

2
code/game/g_turrets.c
View file

@ -652,7 +652,7 @@ static void turret_base_think (gentity_t* self)
iter = entity_list.iterator(&entity_list, LIST_FRONT);
for(c = entity_list.next(iter); c != NULL; c = entity_list.next(iter)) {
target = c->data;
target = (gentity_t*)c->data;
if(target == NULL) {
continue;

8
code/game/g_utils.c
View file

@ -1098,7 +1098,7 @@ int32_t G_RadiusList(vec3_t origin, double radius, list_p ignore, qboolean takeD
if (ignore != NULL) {
iter = ignore->iterator(ignore, LIST_FRONT);
for (c = ignore->next(iter); c != NULL; c = ignore->next(iter)) {
t = c->data;
t = (gentity_t*)c->data;
if (t == NULL) {
continue;
@ -1211,7 +1211,7 @@ int32_t G_RadiusListOfTypes(list_p classnames, vec3_t origin, double radius, lis
if (ignore != NULL) {
iter = ignore->iterator(ignore, LIST_FRONT);
for (c = ignore->next(iter); c != NULL; c = ignore->next(iter)) {
t = c->data;
t = (gentity_t*)c->data;
if (t == NULL) {
continue;
@ -1311,7 +1311,7 @@ gentity_t* G_GetNearestEnt(char* classname, vec3_t origin, double radius, list_p
iter = entList.iterator(&entList, LIST_FRONT);
for (c = entList.next(iter); c != NULL; c = entList.next(iter)) {
t = c->data;
t = (gentity_t*)c->data;
if (t == NULL) {
continue;
@ -1384,7 +1384,7 @@ gentity_t* G_GetNearestPlayer(vec3_t origin, double radius, list_p ignore) {
iter = entList.iterator(&entList, LIST_FRONT);
for (c = entList.next(iter); c != NULL; c = entList.next(iter)) {
t = c->data;
t = (gentity_t*)c->data;
if (t == NULL) {
continue;

7
code/game/g_weapon.c
View file

@ -15,6 +15,11 @@
#include "bg_lex.h"
#include "g_syscalls.h"
vec3_t forward;
vec3_t right;
vec3_t up;
vec3_t muzzle;
weaponConfig_t weaponConfig;
static void G_Weapon_DefaultConfig(void) {
@ -1284,7 +1289,7 @@ static void WP_FireHyperspanner(gentity_t* ent, qboolean alt_fire) {
iter = validEnts.iterator(&validEnts, LIST_FRONT);
for (cont = validEnts.next(iter); cont != NULL; cont = validEnts.next(iter)) {
e = cont->data;
e = (gentity_t*)cont->data;
// TODO: fix problems with small distance
if ((e->spawnflags & 512) != 0) {

8
code/game/g_weapon.h
View file

@ -3,10 +3,10 @@
#include "g_local.h"
vec3_t forward;
vec3_t right;
vec3_t up;
vec3_t muzzle;
extern vec3_t forward;
extern vec3_t right;
extern vec3_t up;
extern vec3_t muzzle;
struct weaponConfigPhaserP_s {
int32_t damage;

184
code/game/game.vcxproj
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -13,20 +13,22 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{F4A59392-23BD-4787-A7D5-AAC517803246}</ProjectGuid>
<RootNamespace>game</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
<Import Project="..\..\..\..\..\..\..\winflex\custom_build_rules\win_flex_only\win_flex_custom_build.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@ -39,11 +41,6 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\Debug\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\Release\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
@ -52,6 +49,13 @@
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)..\..\Build\$(Configuration)\</OutDir>
<TargetName>qagamex86</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<TargetName>qagamex86</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -63,10 +67,6 @@
</HeaderFileName>
</Midl>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>lua\include;mysql;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>__WIN32__;WIN32;_DEBUG;_WINDOWS;DEBUG;QAGAME;XTRA;G_LUA;CG_LUA;SQL=1;LUA_COMPAT_ALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>false</StringPooling>
@ -74,15 +74,12 @@
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderOutputFile>..\Debug\game.pch</PrecompiledHeaderOutputFile>
<AssemblerListingLocation>..\Debug\</AssemblerListingLocation>
<ObjectFileName>..\Debug\</ObjectFileName>
<ProgramDataBaseFileName>..\Debug\</ProgramDataBaseFileName>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>CompileAsC</CompileAs>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>CompileAsCpp</CompileAs>
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
<Optimization>Disabled</Optimization>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -90,23 +87,19 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>C:\Program Files\Raven\Star Trek Voyager Elite Force\RPG-X2\qagamex86.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ModuleDefinitionFile>.\game.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>..\Debug\qagamex86.pdb</ProgramDatabaseFile>
<GenerateMapFile>true</GenerateMapFile>
<MapFileName>..\Debug\qagamex86.map</MapFileName>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>
</OptimizeReferences>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<BaseAddress>0x20000000</BaseAddress>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<ImportLibrary>..\Debug\qagamex86.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
<OutputFile>$(OutDir)qagamex86$(TargetExt)</OutputFile>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -141,12 +134,8 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\Release/qagamex86.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ModuleDefinitionFile>.\game.def</ModuleDefinitionFile>
<ProgramDatabaseFile>.\Release/qagamex86.pdb</ProgramDatabaseFile>
<GenerateMapFile>true</GenerateMapFile>
<MapFileName>.\Release/qagamex86.map</MapFileName>
<SubSystem>Windows</SubSystem>
<BaseAddress>0x20000000</BaseAddress>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@ -154,6 +143,7 @@
</DataExecutionPrevention>
<ImportLibrary>.\Release/qagamex86.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
<OutputFile>$(OutDir)qagamex86$(TargetExt)</OutputFile>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@ -199,7 +189,7 @@
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">WIN32;NDEBUG;_WINDOWS</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="bg_lex.yy.c" />
<ClCompile Include="bg_lex.flex.cpp" />
<ClCompile Include="bg_lib.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
@ -233,36 +223,92 @@
<ClCompile Include="g_cinematic.c" />
<ClCompile Include="bg_collision.c" />
<ClCompile Include="g_logger.c" />
<ClCompile Include="lapi.c" />
<ClCompile Include="lauxlib.c" />
<ClCompile Include="lbaselib.c" />
<ClCompile Include="lapi.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="lauxlib.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="lbaselib.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="lbitlib.c" />
<ClCompile Include="lcode.c" />
<ClCompile Include="lcorolib.c" />
<ClCompile Include="lctype.c" />
<ClCompile Include="ldblib.c" />
<ClCompile Include="ldebug.c" />
<ClCompile Include="ldo.c" />
<ClCompile Include="ldump.c" />
<ClCompile Include="lfunc.c" />
<ClCompile Include="lgc.c" />
<ClCompile Include="linit.c" />
<ClCompile Include="liolib.c" />
<ClCompile Include="lcode.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="lcorolib.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="lctype.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="ldblib.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="ldebug.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="ldo.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="ldump.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="lfunc.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="lgc.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="linit.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="liolib.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="bg_list.c" />
<ClCompile Include="llex.c" />
<ClCompile Include="lmathlib.c" />
<ClCompile Include="lmem.c" />
<ClCompile Include="loadlib.c" />
<ClCompile Include="lobject.c" />
<ClCompile Include="lopcodes.c" />
<ClCompile Include="loslib.c" />
<ClCompile Include="lparser.c" />
<ClCompile Include="lstate.c" />
<ClCompile Include="lstring.c" />
<ClCompile Include="lstrlib.c" />
<ClCompile Include="ltable.c" />
<ClCompile Include="ltablib.c" />
<ClCompile Include="ltm.c" />
<ClCompile Include="llex.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="lmathlib.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="lmem.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="loadlib.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="lobject.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="lopcodes.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="loslib.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="lparser.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="lstate.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="lstring.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="lstrlib.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="ltable.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="ltablib.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="ltm.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="lua_cinematic.c" />
<ClCompile Include="lua_cvar.c" />
<ClCompile Include="lua_game.c" />
@ -457,9 +503,15 @@
<ClCompile Include="lua_sound.c" />
<ClCompile Include="lua_trace.c" />
<ClCompile Include="lua_weapons.c" />
<ClCompile Include="lundump.c" />
<ClCompile Include="lvm.c" />
<ClCompile Include="lzio.c" />
<ClCompile Include="lundump.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="lvm.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="lzio.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
</ClCompile>
<ClCompile Include="md5.c" />
<ClCompile Include="memorypool.c" />
<ClCompile Include="q_math.c">
@ -478,7 +530,9 @@
</ClCompile>
<ClCompile Include="lua_vector.c" />
<ClCompile Include="g_local.c" />
<ClCompile Include="sqlite3.c" />
<ClCompile Include="sqlite3.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\qcommon\stv_version.h" />
@ -565,7 +619,10 @@
<ClInclude Include="syn.h" />
</ItemGroup>
<ItemGroup>
<None Include="bg_lex.lex" />
<Flex Include="bg_lex.l">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
</Flex>
<None Include="game.def" />
<CustomBuildStep Include="g_syscalls.asm">
<FileType>Document</FileType>
@ -592,5 +649,6 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\..\..\..\..\..\winflex\custom_build_rules\win_flex_only\win_flex_custom_build.targets" />
</ImportGroup>
</Project>

14
code/game/game.vcxproj.filters
View file

@ -276,9 +276,6 @@
<ClCompile Include="sqlite3.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="bg_lex.yy.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="memorypool.c">
<Filter>Source Files</Filter>
</ClCompile>
@ -294,6 +291,9 @@
<ClCompile Include="g_local.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="bg_lex.flex.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="ai_chat.h">
@ -547,13 +547,15 @@
<None Include="game.def">
<Filter>Resource Files</Filter>
</None>
<None Include="bg_lex.lex">
<Filter>Source Files</Filter>
</None>
</ItemGroup>
<ItemGroup>
<CustomBuildStep Include="g_syscalls.asm" />
<CustomBuildStep Include="game.bat" />
<CustomBuildStep Include="game.q3asm" />
</ItemGroup>
<ItemGroup>
<Flex Include="bg_lex.l">
<Filter>Source Files</Filter>
</Flex>
</ItemGroup>
</Project>

7
code/game/lapi.c
View file

@ -4,6 +4,10 @@
** See Copyright Notice in lua.h
*/
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4702)
#endif
#include <stdarg.h>
#include <string.h>
@ -1282,3 +1286,6 @@ LUA_API void lua_upvaluejoin (lua_State *L, int fidx1, int n1,
luaC_objbarrier(L, f1, *up2);
}
#ifdef _MSC_VER
#pragma warning(pop)
#endif

13
code/game/lauxlib.c
View file

@ -5,6 +5,11 @@
*/
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4996)
#endif
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
@ -600,7 +605,7 @@ static int skipBOM (LoadF *lf) {
do {
c = getc(lf->f);
if (c == EOF || c != *(const unsigned char *)p++) return c;
lf->buff[lf->n++] = c; /* to be read by the parser */
lf->buff[lf->n++] = (char)c; /* to be read by the parser */
} while (*p != '\0');
lf->n = 0; /* prefix matched; discard it */
return getc(lf->f); /* return next character */
@ -650,7 +655,7 @@ LUALIB_API int luaL_loadfilex (lua_State *L, const char *filename,
skipcomment(&lf, &c); /* re-read initial portion */
}
if (c != EOF)
lf.buff[lf.n++] = c; /* 'c' is the first character of the stream */
lf.buff[lf.n++] = (char)c; /* 'c' is the first character of the stream */
status = lua_load(L, getF, &lf, lua_tostring(L, -1), mode);
readstatus = ferror(lf.f);
if (filename) fclose(lf.f); /* close file (even in case of errors) */
@ -957,3 +962,7 @@ LUALIB_API void luaL_checkversion_ (lua_State *L, lua_Number ver) {
lua_pop(L, 1);
}
#ifdef _MSC_VER
#pragma warning(pop)
#endif

7
code/game/lcode.c
View file

@ -4,6 +4,10 @@
** See Copyright Notice in lua.h
*/
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4244)
#endif
#include <stdlib.h>
@ -879,3 +883,6 @@ void luaK_setlist (FuncState *fs, int base, int nelems, int tostore) {
fs->freereg = base + 1; /* free registers with list values */
}
#ifdef _MSC_VER
#pragma warning(pop)
#endif

8
code/game/ldo.c
View file

@ -4,6 +4,10 @@
** See Copyright Notice in lua.h
*/
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4244)
#endif
#include <setjmp.h>
#include <stdlib.h>
@ -670,4 +674,6 @@ int luaD_protectedparser (lua_State *L, ZIO *z, const char *name,
return status;
}
#ifdef _MSC_VER
#pragma warning(pop)
#endif

9
code/game/lgc.c
View file

@ -4,6 +4,12 @@
** See Copyright Notice in lua.h
*/
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4244)
#endif
#include <string.h>
#define lgc_c
@ -1210,4 +1216,7 @@ void luaC_fullgc (lua_State *L, int isemergency) {
/* }====================================================== */
#ifdef _MSC_VER
#pragma warning(pop)
#endif

9
code/game/liolib.c
View file

@ -4,6 +4,10 @@
** See Copyright Notice in lua.h
*/
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4996)
#endif
/*
** POSIX idiosyncrasy!
@ -663,3 +667,8 @@ LUAMOD_API int luaopen_io (lua_State *L) {
return 1;
}
#ifdef _MSC_VER
#pragma warning(pop)
#endif

9
code/game/loadlib.c
View file

@ -29,6 +29,11 @@
#include "lauxlib.h"
#include "lualib.h"
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4996)
#endif
/*
** LUA_PATH and LUA_CPATH are the names of the environment
@ -723,3 +728,7 @@ LUAMOD_API int luaopen_package (lua_State *L) {
return 1; /* return 'package' table */
}
#ifdef _MSC_VER
#pragma warning(pop)
#endif

9
code/game/lobject.c
View file

@ -23,7 +23,10 @@
#include "lstring.h"
#include "lvm.h"
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4996)
#endif
LUAI_DDEF const TValue luaO_nilobject_ = {NILCONSTANT};
@ -285,3 +288,7 @@ void luaO_chunkid (char *out, const char *source, size_t bufflen) {
}
}
#ifdef _MSC_VER
#pragma warning(pop)
#endif

8
code/game/loslib.c
View file

@ -19,6 +19,10 @@
#include "lauxlib.h"
#include "lualib.h"
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4996)
#endif
/*
** list of valid conversion specifiers for the 'strftime' function
@ -321,3 +325,7 @@ LUAMOD_API int luaopen_os (lua_State *L) {
return 1;
}
#ifdef _MSC_VER
#pragma warning(pop)
#endif

8
code/game/lparser.c
View file

@ -25,6 +25,10 @@
#include "lstring.h"
#include "ltable.h"
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4244)
#endif
/* maximum number of local variables per function (must be smaller
@ -1636,3 +1640,7 @@ Closure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
return cl; /* it's on the stack too */
}
#ifdef _MSC_VER
#pragma warning(pop)
#endif

10
code/game/lstrlib.c
View file

@ -19,6 +19,12 @@
#include "lauxlib.h"
#include "lualib.h"
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4244)
#pragma warning(disable:4996)
#endif
/*
** maximum number of captures that a pattern can do during
@ -1017,3 +1023,7 @@ LUAMOD_API int luaopen_string (lua_State *L) {
return 1;
}
#ifdef _MSC_VER
#pragma warning(pop)
#endif

2
code/game/lua_entity.c
View file

@ -2779,7 +2779,7 @@ static int Entity_SetMoverstate(lua_State *L) {
lua_pushboolean(L, qfalse);
return 1;
}
m = (moverState_t)luaL_checknumber(L, 2);
m = static_cast<moverState_t>(int32_t(luaL_checknumber(L, 2)));
lent->e->moverState = m;

2
code/game/lua_game.c
View file

@ -338,7 +338,7 @@ static int Game_AlertAddShader(lua_State *L) {
lua_pushboolean(L, 0);
return 1;
}
luaAlertState->shaders[cond] = tmp;
luaAlertState->shaders[cond] = (char*)tmp;
Com_sprintf(luaAlertState->shaders[cond], sizeof(luaAlertState->shaders[cond]), "%s\n%s", luaAlertState->shaders[cond], shader);
}

9
code/game/lvm.c
View file

@ -27,6 +27,11 @@
#include "lvm.h"
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4996)
#endif
/* limit for table tag-method chains (to avoid loops) */
#define MAXTAGLOOP 100
@ -865,3 +870,7 @@ void luaV_execute (lua_State *L) {
}
}
#ifdef _MSC_VER
#pragma warning(pop)
#endif

4
code/game/md5.c
View file

@ -61,7 +61,7 @@ void MD5Init(struct MD5Context *ctx)
* Update context to reflect the concatenation of another buffer full
* of bytes.
*/
void MD5Update(struct MD5Context *ctx, unsigned char *buf, unsigned len)
void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len)
{
uint32 t;
@ -109,7 +109,7 @@ void MD5Update(struct MD5Context *ctx, unsigned char *buf, unsigned len)
* Final wrapup - pad to 64-byte boundary with the bit pattern
* 1 0* (64-bit count of bits processed, MSB-first)
*/
void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
void MD5Final(struct MD5Context *ctx, unsigned char *digest)
{
unsigned count;
unsigned char *p;

8
code/game/md5.h
View file

@ -41,10 +41,10 @@ struct MD5Context {
unsigned char in[64];
};
extern void MD5Init(struct MD5Context *ctx);
extern void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len);
extern void MD5Final(struct MD5Context *Ctx, unsigned char *digest);
extern void MD5Transform(uint32 buf[4], uint32 in[16]);
void MD5Init(struct MD5Context *ctx);
void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len);
void MD5Final(struct MD5Context *Ctx, unsigned char *digest);
void MD5Transform(uint32 buf[4], uint32 in[16]);
/*
* This is needed to make RSAREF happy on some MS-DOS compilers.

32
code/game/memorypool.h
View file

@ -1,21 +1,21 @@
#ifndef MEMORYPOOL_H_
#define MEMORYPOOL_H_
#include "g_local.h"
#include "list.h"
typedef struct mempool_s mempool_t;
typedef struct mempool_t * mempool_p;
struct mempool_s {
list_p memory;
};
typedef struct mempool_object_s mempool_object_t;
typedef struct mempool_object_t * mempool_object_p;
struct mempool_object_s {
void* mem_ptr;
uint32_t mem_cnt;
};
//#include "g_local.h"
//#include "list.h"
//
//typedef struct mempool_s mempool_t;
//typedef struct mempool_t * mempool_p;
//
//struct mempool_s {
// list_p memory;
//};
//
//typedef struct mempool_object_s mempool_object_t;
//typedef struct mempool_object_t * mempool_object_p;
//struct mempool_object_s {
// void* mem_ptr;
// uint32_t mem_cnt;
//};
#endif

248
code/game/q_math.c
View file

@ -21,58 +21,58 @@ vec4_t colorTable[CT_MAX] =
{ 1, 1, 0, 1 }, /* CT_YELLOW */
{ 1, 0, 1, 1 }, /* CT_MAGENTA */
{ 0, 1, 1, 1 }, /* CT_CYAN */
{ 0.071, 0.271, 0.29, 1 }, /* CT_TEAL */
{ 0.529, 0.373, 0.017, 1 },/* CT_GOLD */
{ 0.071f, 0.271f, 0.29f, 1 }, /* CT_TEAL */
{ 0.529f, 0.373f, 0.017f, 1 },/* CT_GOLD */
{ 1, 1, 1, 1 }, /* CT_WHITE */
{ 0.75, 0.75, 0.75, 1 }, /* CT_LTGREY */
{ 0.50, 0.50, 0.50, 1 }, /* CT_MDGREY */
{ 0.25, 0.25, 0.25, 1 }, /* CT_DKGREY */
{ 0.15, 0.15, 0.15, 1 }, /* CT_DKGREY2 */
{ 0.75f, 0.75f, 0.75f, 1 }, /* CT_LTGREY */
{ 0.50f, 0.50f, 0.50f, 1 }, /* CT_MDGREY */
{ 0.25f, 0.25f, 0.25f, 1 }, /* CT_DKGREY */
{ 0.15f, 0.15f, 0.15f, 1 }, /* CT_DKGREY2 */
{ 0.688, 0.797, 1, 1 }, /* CT_VLTORANGE -- needs values */
{ 0.688, 0.797, 1, 1 }, /* CT_LTORANGE */
{ 0.620, 0.710, 0.894, 1 },/* CT_DKORANGE */
{ 0.463, 0.525, 0.671, 1 },/* CT_VDKORANGE */
{ 0.688f, 0.797f, 1, 1 }, /* CT_VLTORANGE -- needs values */
{ 0.688f, 0.797f, 1, 1 }, /* CT_LTORANGE */
{ 0.620f, 0.710f, 0.894f, 1 },/* CT_DKORANGE */
{ 0.463f, 0.525f, 0.671f, 1 },/* CT_VDKORANGE */
{ 0.616, 0.718, 0.898, 1 },/* CT_VLTBLUE1 */
{ 0.286, 0.506, 0.898, 1 },/* CT_LTBLUE1 */
{ 0.082, 0.388, 0.898, 1 },/* CT_DKBLUE1 */
{ 0.063, 0.278, 0.514, 1 },/* CT_VDKBLUE1 */
{ 0.616f, 0.718f, 0.898f, 1 },/* CT_VLTBLUE1 */
{ 0.286f, 0.506f, 0.898f, 1 },/* CT_LTBLUE1 */
{ 0.082f, 0.388f, 0.898f, 1 },/* CT_DKBLUE1 */
{ 0.063f, 0.278f, 0.514f, 1 },/* CT_VDKBLUE1 */
{ 0.302, 0.380, 0.612, 1 },/* CT_VLTBLUE2 -- needs values */
{ 0.196, 0.314, 0.612, 1 },/* CT_LTBLUE2 */
{ 0.060, 0.227, 0.611, 1 },/* CT_DKBLUE2 */
{ 0.043, 0.161, 0.459, 1 },/* CT_VDKBLUE2 */
{ 0.302f, 0.380f, 0.612f, 1 },/* CT_VLTBLUE2 -- needs values */
{ 0.196f, 0.314f, 0.612f, 1 },/* CT_LTBLUE2 */
{ 0.060f, 0.227f, 0.611f, 1 },/* CT_DKBLUE2 */
{ 0.043f, 0.161f, 0.459f, 1 },/* CT_VDKBLUE2 */
{ 0.082, 0.388, 0.898, 1 },/* CT_VLTBROWN1 -- needs values */
{ 0.082, 0.388, 0.898, 1 },/* CT_LTBROWN1 */
{ 0.078, 0.320, 0.813, 1 },/* CT_DKBROWN1 */
{ 0.060, 0.227, 0.611, 1 },/* CT_VDKBROWN1 */
{ 0.082f, 0.388f, 0.898f, 1 },/* CT_VLTBROWN1 -- needs values */
{ 0.082f, 0.388f, 0.898f, 1 },/* CT_LTBROWN1 */
{ 0.078f, 0.320f, 0.813f, 1 },/* CT_DKBROWN1 */
{ 0.060f, 0.227f, 0.611f, 1 },/* CT_VDKBROWN1 */
{ 1, 0.784, 0.365, 1 }, /* CT_VLTGOLD1 -- needs values */
{ 1, 0.706, 0.153, 1 }, /* CT_LTGOLD1 */
{ 0.733, 0.514, 0.086, 1 },/* CT_DKGOLD1 */
{ 0.549, 0.384, 0.063, 1 },/* CT_VDKGOLD1 */
{ 1, 0.784f, 0.365f, 1 }, /* CT_VLTGOLD1 -- needs values */
{ 1, 0.706f, 0.153f, 1 }, /* CT_LTGOLD1 */
{ 0.733f, 0.514f, 0.086f, 1 },/* CT_DKGOLD1 */
{ 0.549f, 0.384f, 0.063f, 1 },/* CT_VDKGOLD1 */
{ 0.688, 0.797, 1, 1 }, /* CT_VLTPURPLE1 -- needs values */
{ 0.688, 0.797, 1, 1 }, /* CT_LTPURPLE1 */
{ 0.313, 0.578, 1, 1 }, /* CT_DKPURPLE1 */
{ 0.031, 0.110, 0.341, 1 },/* CT_VDKPURPLE1 */
{ 0.688f, 0.797f, 1, 1 }, /* CT_VLTPURPLE1 -- needs values */
{ 0.688f, 0.797f, 1, 1 }, /* CT_LTPURPLE1 */
{ 0.313f, 0.578f, 1, 1 }, /* CT_DKPURPLE1 */
{ 0.031f, 0.110f, 0.341f, 1 },/* CT_VDKPURPLE1 */
{ 0.688, 0.797, 1, 1 }, /* CT_VLTPURPLE2 -- needs values */
{ 0.688, 0.797, 1, 1 }, /* CT_LTPURPLE2 */
{ 0.688, 0.797, 1, 1 }, /* CT_DKPURPLE2 */
{ 0.031, 0.110, 0.341, 1 },/* CT_VDKPURPLE2 */
{ 0.688f, 0.797f, 1, 1 }, /* CT_VLTPURPLE2 -- needs values */
{ 0.688f, 0.797f, 1, 1 }, /* CT_LTPURPLE2 */
{ 0.688f, 0.797f, 1, 1 }, /* CT_DKPURPLE2 */
{ 0.031f, 0.110f, 0.341f, 1 },/* CT_VDKPURPLE2 */
{ 0.686, 0.808, 0.1, 1 }, /* CT_VLTPURPLE3 */
{ 0.188, 0.494, 1, 1 }, /* CT_LTPURPLE3 */
{ 0.094, 0.471, 1, 1 }, /* CT_DKPURPLE3 */
{ 0.067, 0.325, 0.749, 1 },/* CT_VDKPURPLE3 */
{ 0.686f, 0.808f, 0.1f, 1 }, /* CT_VLTPURPLE3 */
{ 0.188f, 0.494f, 1, 1 }, /* CT_LTPURPLE3 */
{ 0.094f, 0.471f, 1, 1 }, /* CT_DKPURPLE3 */
{ 0.067f, 0.325f, 0.749f, 1 },/* CT_VDKPURPLE3 */
{ 1, 0.612, 0.325, 1 }, /* CT_VLTRED1 */
{ 1, 0.478, 0.098, 1 }, /* CT_LTRED1 */
{ 1, 0.438, 0, 1 }, /* CT_DKRED1 */
{ 0.784, 0.329, 0, 1 }, /* CT_VDKRED1 */
{ 1, 0.612f, 0.325f, 1 }, /* CT_VLTRED1 */
{ 1, 0.478f, 0.098f, 1 }, /* CT_LTRED1 */
{ 1, 0.438f, 0, 1 }, /* CT_DKRED1 */
{ 0.784f, 0.329f, 0, 1 }, /* CT_VDKRED1 */
};
@ -103,87 +103,87 @@ vec4_t g_color_table[8] =
vec3_t bytedirs[NUMVERTEXNORMALS] =
{
{ -0.525731, 0.000000, 0.850651 }, { -0.442863, 0.238856, 0.864188 },
{ -0.295242, 0.000000, 0.955423 }, { -0.309017, 0.500000, 0.809017 },
{ -0.162460, 0.262866, 0.951056 }, { 0.000000, 0.000000, 1.000000 },
{ 0.000000, 0.850651, 0.525731 }, { -0.147621, 0.716567, 0.681718 },
{ 0.147621, 0.716567, 0.681718 }, { 0.000000, 0.525731, 0.850651 },
{ 0.309017, 0.500000, 0.809017 }, { 0.525731, 0.000000, 0.850651 },
{ 0.295242, 0.000000, 0.955423 }, { 0.442863, 0.238856, 0.864188 },
{ 0.162460, 0.262866, 0.951056 }, { -0.681718, 0.147621, 0.716567 },
{ -0.809017, 0.309017, 0.500000 }, { -0.587785, 0.425325, 0.688191 },
{ -0.850651, 0.525731, 0.000000 }, { -0.864188, 0.442863, 0.238856 },
{ -0.716567, 0.681718, 0.147621 }, { -0.688191, 0.587785, 0.425325 },
{ -0.500000, 0.809017, 0.309017 }, { -0.238856, 0.864188, 0.442863 },
{ -0.425325, 0.688191, 0.587785 }, { -0.716567, 0.681718, -0.147621 },
{ -0.500000, 0.809017, -0.309017 }, { -0.525731, 0.850651, 0.000000 },
{ 0.000000, 0.850651, -0.525731 }, { -0.238856, 0.864188, -0.442863 },
{ 0.000000, 0.955423, -0.295242 }, { -0.262866, 0.951056, -0.162460 },
{ 0.000000, 1.000000, 0.000000 }, { 0.000000, 0.955423, 0.295242 },
{ -0.262866, 0.951056, 0.162460 }, { 0.238856, 0.864188, 0.442863 },
{ 0.262866, 0.951056, 0.162460 }, { 0.500000, 0.809017, 0.309017 },
{ 0.238856, 0.864188, -0.442863 }, { 0.262866, 0.951056, -0.162460 },
{ 0.500000, 0.809017, -0.309017 }, { 0.850651, 0.525731, 0.000000 },
{ 0.716567, 0.681718, 0.147621 }, { 0.716567, 0.681718, -0.147621 },
{ 0.525731, 0.850651, 0.000000 }, { 0.425325, 0.688191, 0.587785 },
{ 0.864188, 0.442863, 0.238856 }, { 0.688191, 0.587785, 0.425325 },
{ 0.809017, 0.309017, 0.500000 }, { 0.681718, 0.147621, 0.716567 },
{ 0.587785, 0.425325, 0.688191 }, { 0.955423, 0.295242, 0.000000 },
{ 1.000000, 0.000000, 0.000000 }, { 0.951056, 0.162460, 0.262866 },
{ 0.850651, -0.525731, 0.000000 }, { 0.955423, -0.295242, 0.000000 },
{ 0.864188, -0.442863, 0.238856 }, { 0.951056, -0.162460, 0.262866 },
{ 0.809017, -0.309017, 0.500000 }, { 0.681718, -0.147621, 0.716567 },
{ 0.850651, 0.000000, 0.525731 }, { 0.864188, 0.442863, -0.238856 },
{ 0.809017, 0.309017, -0.500000 }, { 0.951056, 0.162460, -0.262866 },
{ 0.525731, 0.000000, -0.850651 }, { 0.681718, 0.147621, -0.716567 },
{ 0.681718, -0.147621, -0.716567 }, { 0.850651, 0.000000, -0.525731 },
{ 0.809017, -0.309017, -0.500000 }, { 0.864188, -0.442863, -0.238856 },
{ 0.951056, -0.162460, -0.262866 }, { 0.147621, 0.716567, -0.681718 },
{ 0.309017, 0.500000, -0.809017 }, { 0.425325, 0.688191, -0.587785 },
{ 0.442863, 0.238856, -0.864188 }, { 0.587785, 0.425325, -0.688191 },
{ 0.688191, 0.587785, -0.425325 }, { -0.147621, 0.716567, -0.681718 },
{ -0.309017, 0.500000, -0.809017 }, { 0.000000, 0.525731, -0.850651 },
{ -0.525731, 0.000000, -0.850651 }, { -0.442863, 0.238856, -0.864188 },
{ -0.295242, 0.000000, -0.955423 }, { -0.162460, 0.262866, -0.951056 },
{ 0.000000, 0.000000, -1.000000 }, { 0.295242, 0.000000, -0.955423 },
{ 0.162460, 0.262866, -0.951056 }, { -0.442863, -0.238856, -0.864188 },
{ -0.309017, -0.500000, -0.809017 }, { -0.162460, -0.262866, -0.951056 },
{ 0.000000, -0.850651, -0.525731 }, { -0.147621, -0.716567, -0.681718 },
{ 0.147621, -0.716567, -0.681718 }, { 0.000000, -0.525731, -0.850651 },
{ 0.309017, -0.500000, -0.809017 }, { 0.442863, -0.238856, -0.864188 },
{ 0.162460, -0.262866, -0.951056 }, { 0.238856, -0.864188, -0.442863 },
{ 0.500000, -0.809017, -0.309017 }, { 0.425325, -0.688191, -0.587785 },
{ 0.716567, -0.681718, -0.147621 }, { 0.688191, -0.587785, -0.425325 },
{ 0.587785, -0.425325, -0.688191 }, { 0.000000, -0.955423, -0.295242 },
{ 0.000000, -1.000000, 0.000000 }, { 0.262866, -0.951056, -0.162460 },
{ 0.000000, -0.850651, 0.525731 }, { 0.000000, -0.955423, 0.295242 },
{ 0.238856, -0.864188, 0.442863 }, { 0.262866, -0.951056, 0.162460 },
{ 0.500000, -0.809017, 0.309017 }, { 0.716567, -0.681718, 0.147621 },
{ 0.525731, -0.850651, 0.000000 }, { -0.238856, -0.864188, -0.442863 },
{ -0.500000, -0.809017, -0.309017 }, { -0.262866, -0.951056, -0.162460 },
{ -0.850651, -0.525731, 0.000000 }, { -0.716567, -0.681718, -0.147621 },
{ -0.716567, -0.681718, 0.147621 }, { -0.525731, -0.850651, 0.000000 },
{ -0.500000, -0.809017, 0.309017 }, { -0.238856, -0.864188, 0.442863 },
{ -0.262866, -0.951056, 0.162460 }, { -0.864188, -0.442863, 0.238856 },
{ -0.809017, -0.309017, 0.500000 }, { -0.688191, -0.587785, 0.425325 },
{ -0.681718, -0.147621, 0.716567 }, { -0.442863, -0.238856, 0.864188 },
{ -0.587785, -0.425325, 0.688191 }, { -0.309017, -0.500000, 0.809017 },
{ -0.147621, -0.716567, 0.681718 }, { -0.425325, -0.688191, 0.587785 },
{ -0.162460, -0.262866, 0.951056 }, { 0.442863, -0.238856, 0.864188 },
{ 0.162460, -0.262866, 0.951056 }, { 0.309017, -0.500000, 0.809017 },
{ 0.147621, -0.716567, 0.681718 }, { 0.000000, -0.525731, 0.850651 },
{ 0.425325, -0.688191, 0.587785 }, { 0.587785, -0.425325, 0.688191 },
{ 0.688191, -0.587785, 0.425325 }, { -0.955423, 0.295242, 0.000000 },
{ -0.951056, 0.162460, 0.262866 }, { -1.000000, 0.000000, 0.000000 },
{ -0.850651, 0.000000, 0.525731 }, { -0.955423, -0.295242, 0.000000 },
{ -0.951056, -0.162460, 0.262866 }, { -0.864188, 0.442863, -0.238856 },
{ -0.951056, 0.162460, -0.262866 }, { -0.809017, 0.309017, -0.500000 },
{ -0.864188, -0.442863, -0.238856 }, { -0.951056, -0.162460, -0.262866 },
{ -0.809017, -0.309017, -0.500000 }, { -0.681718, 0.147621, -0.716567 },
{ -0.681718, -0.147621, -0.716567 }, { -0.850651, 0.000000, -0.525731 },
{ -0.688191, 0.587785, -0.425325 }, { -0.587785, 0.425325, -0.688191 },
{ -0.425325, 0.688191, -0.587785 }, { -0.425325, -0.688191, -0.587785 },
{ -0.587785, -0.425325, -0.688191 }, { -0.688191, -0.587785, -0.425325 }
{ -0.525731f, 0.000000f, 0.850651f }, { -0.442863f, 0.238856f, 0.864188f },
{ -0.295242f, 0.000000f, 0.955423f }, { -0.309017f, 0.500000f, 0.809017f },
{ -0.162460f, 0.262866f, 0.951056f }, { 0.000000f, 0.000000f, 1.000000f },
{ 0.000000f, 0.850651f, 0.525731f }, { -0.147621f, 0.716567f, 0.681718f },
{ 0.147621f, 0.716567f, 0.681718f }, { 0.000000f, 0.525731f, 0.850651f },
{ 0.309017f, 0.500000f, 0.809017f }, { 0.525731f, 0.000000f, 0.850651f },
{ 0.295242f, 0.000000f, 0.955423f }, { 0.442863f, 0.238856f, 0.864188f },
{ 0.162460f, 0.262866f, 0.951056f }, { -0.681718f, 0.147621f, 0.716567f },
{ -0.809017f, 0.309017f, 0.500000f }, { -0.587785f, 0.425325f, 0.688191f },
{ -0.850651f, 0.525731f, 0.000000f }, { -0.864188f, 0.442863f, 0.238856f },
{ -0.716567f, 0.681718f, 0.147621f }, { -0.688191f, 0.587785f, 0.425325f },
{ -0.500000f, 0.809017f, 0.309017f }, { -0.238856f, 0.864188f, 0.442863f },
{ -0.425325f, 0.688191f, 0.587785f }, { -0.716567f, 0.681718f, -0.147621f },
{ -0.500000f, 0.809017f, -0.309017f }, { -0.525731f, 0.850651f, 0.000000f },
{ 0.000000f, 0.850651f, -0.525731f }, { -0.238856f, 0.864188f, -0.442863f },
{ 0.000000f, 0.955423f, -0.295242f }, { -0.262866f, 0.951056f, -0.162460f },
{ 0.000000f, 1.000000f, 0.000000f }, { 0.000000f, 0.955423f, 0.295242f },
{ -0.262866f, 0.951056f, 0.162460f }, { 0.238856f, 0.864188f, 0.442863f },
{ 0.262866f, 0.951056f, 0.162460f }, { 0.500000f, 0.809017f, 0.309017f },
{ 0.238856f, 0.864188f, -0.442863f }, { 0.262866f, 0.951056f, -0.162460f },
{ 0.500000f, 0.809017f, -0.309017f }, { 0.850651f, 0.525731f, 0.000000f },
{ 0.716567f, 0.681718f, 0.147621f }, { 0.716567f, 0.681718f, -0.147621f },
{ 0.525731f, 0.850651f, 0.000000f }, { 0.425325f, 0.688191f, 0.587785f },
{ 0.864188f, 0.442863f, 0.238856f }, { 0.688191f, 0.587785f, 0.425325f },
{ 0.809017f, 0.309017f, 0.500000f }, { 0.681718f, 0.147621f, 0.716567f },
{ 0.587785f, 0.425325f, 0.688191f }, { 0.955423f, 0.295242f, 0.000000f },
{ 1.000000f, 0.000000f, 0.000000f }, { 0.951056f, 0.162460f, 0.262866f },
{ 0.850651f, -0.525731f, 0.000000f }, { 0.955423f, -0.295242f, 0.000000f },
{ 0.864188f, -0.442863f, 0.238856f }, { 0.951056f, -0.162460f, 0.262866f },
{ 0.809017f, -0.309017f, 0.500000f }, { 0.681718f, -0.147621f, 0.716567f },
{ 0.850651f, 0.000000f, 0.525731f }, { 0.864188f, 0.442863f, -0.238856f },
{ 0.809017f, 0.309017f, -0.500000f }, { 0.951056f, 0.162460f, -0.262866f },
{ 0.525731f, 0.000000f, -0.850651f }, { 0.681718f, 0.147621f, -0.716567f },
{ 0.681718f, -0.147621f, -0.716567f }, { 0.850651f, 0.000000f, -0.525731f },
{ 0.809017f, -0.309017f, -0.500000f }, { 0.864188f, -0.442863f, -0.238856f },
{ 0.951056f, -0.162460f, -0.262866f }, { 0.147621f, 0.716567f, -0.681718f },
{ 0.309017f, 0.500000f, -0.809017f }, { 0.425325f, 0.688191f, -0.587785f },
{ 0.442863f, 0.238856f, -0.864188f }, { 0.587785f, 0.425325f, -0.688191f },
{ 0.688191f, 0.587785f, -0.425325f }, { -0.147621f, 0.716567f, -0.681718f },
{ -0.309017f, 0.500000f, -0.809017f }, { 0.000000f, 0.525731f, -0.850651f },
{ -0.525731f, 0.000000f, -0.850651f }, { -0.442863f, 0.238856f, -0.864188f },
{ -0.295242f, 0.000000f, -0.955423f }, { -0.162460f, 0.262866f, -0.951056f },
{ 0.000000f, 0.000000f, -1.000000f }, { 0.295242f, 0.000000f, -0.955423f },
{ 0.162460f, 0.262866f, -0.951056f }, { -0.442863f, -0.238856f, -0.864188f },
{ -0.309017f, -0.500000f, -0.809017f }, { -0.162460f, -0.262866f, -0.951056f },
{ 0.000000f, -0.850651f, -0.525731f }, { -0.147621f, -0.716567f, -0.681718f },
{ 0.147621f, -0.716567f, -0.681718f }, { 0.000000f, -0.525731f, -0.850651f },
{ 0.309017f, -0.500000f, -0.809017f }, { 0.442863f, -0.238856f, -0.864188f },
{ 0.162460f, -0.262866f, -0.951056f }, { 0.238856f, -0.864188f, -0.442863f },
{ 0.500000f, -0.809017f, -0.309017f }, { 0.425325f, -0.688191f, -0.587785f },
{ 0.716567f, -0.681718f, -0.147621f }, { 0.688191f, -0.587785f, -0.425325f },
{ 0.587785f, -0.425325f, -0.688191f }, { 0.000000f, -0.955423f, -0.295242f },
{ 0.000000f, -1.000000f, 0.000000f }, { 0.262866f, -0.951056f, -0.162460f },
{ 0.000000f, -0.850651f, 0.525731f }, { 0.000000f, -0.955423f, 0.295242f },
{ 0.238856f, -0.864188f, 0.442863f }, { 0.262866f, -0.951056f, 0.162460f },
{ 0.500000f, -0.809017f, 0.309017f }, { 0.716567f, -0.681718f, 0.147621f },
{ 0.525731f, -0.850651f, 0.000000f }, { -0.238856f, -0.864188f, -0.442863f },
{ -0.500000f, -0.809017f, -0.309017f }, { -0.262866f, -0.951056f, -0.162460f },
{ -0.850651f, -0.525731f, 0.000000f }, { -0.716567f, -0.681718f, -0.147621f },
{ -0.716567f, -0.681718f, 0.147621f }, { -0.525731f, -0.850651f, 0.000000f },
{ -0.500000f, -0.809017f, 0.309017f }, { -0.238856f, -0.864188f, 0.442863f },
{ -0.262866f, -0.951056f, 0.162460f }, { -0.864188f, -0.442863f, 0.238856f },
{ -0.809017f, -0.309017f, 0.500000f }, { -0.688191f, -0.587785f, 0.425325f },
{ -0.681718f, -0.147621f, 0.716567f }, { -0.442863f, -0.238856f, 0.864188f },
{ -0.587785f, -0.425325f, 0.688191f }, { -0.309017f, -0.500000f, 0.809017f },
{ -0.147621f, -0.716567f, 0.681718f }, { -0.425325f, -0.688191f, 0.587785f },
{ -0.162460f, -0.262866f, 0.951056f }, { 0.442863f, -0.238856f, 0.864188f },
{ 0.162460f, -0.262866f, 0.951056f }, { 0.309017f, -0.500000f, 0.809017f },
{ 0.147621f, -0.716567f, 0.681718f }, { 0.000000f, -0.525731f, 0.850651f },
{ 0.425325f, -0.688191f, 0.587785f }, { 0.587785f, -0.425325f, 0.688191f },
{ 0.688191f, -0.587785f, 0.425325f }, { -0.955423f, 0.295242f, 0.000000f },
{ -0.951056f, 0.162460f, 0.262866f }, { -1.000000f, 0.000000f, 0.000000f },
{ -0.850651f, 0.000000f, 0.525731f }, { -0.955423f, -0.295242f, 0.000000f },
{ -0.951056f, -0.162460f, 0.262866f }, { -0.864188f, 0.442863f, -0.238856f },
{ -0.951056f, 0.162460f, -0.262866f }, { -0.809017f, 0.309017f, -0.500000f },
{ -0.864188f, -0.442863f, -0.238856f }, { -0.951056f, -0.162460f, -0.262866f },
{ -0.809017f, -0.309017f, -0.500000f }, { -0.681718f, 0.147621f, -0.716567f },
{ -0.681718f, -0.147621f, -0.716567f }, { -0.850651f, 0.000000f, -0.525731f },
{ -0.688191f, 0.587785f, -0.425325f }, { -0.587785f, 0.425325f, -0.688191f },
{ -0.425325f, 0.688191f, -0.587785f }, { -0.425325f, -0.688191f, -0.587785f },
{ -0.587785f, -0.425325f, -0.688191f }, { -0.688191f, -0.587785f, -0.425325f }
};
/*==============================================================*/
@ -553,7 +553,7 @@ float Q_rsqrt(float number) {
return y;
}
float Q_fabs(float f) {
double Q_fabs(double f) {
int32_t tmp = *(int32_t *)&f;
tmp &= 0x7FFFFFFF;
return *(float *)&tmp;

2
code/game/q_shared.h
View file

@ -35,6 +35,8 @@
#pragma warning(disable : 4711) // selected for automatic inline expansion
#pragma warning(disable : 4220) // varargs matches remaining parameters
#define _CRT_SECURE_NO_WARNINGS
#endif
//Ignore __attribute__ on non-gcc platforms

15
code/game/sqlite3.c
View file

@ -70,6 +70,17 @@
# define _LARGEFILE_SOURCE 1
#endif
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4127)
#pragma warning(disable:4244)
#pragma warning(disable:4232)
#pragma warning(disable:4996)
#pragma warning(disable:4701)
#pragma warning(disable:4706)
#pragma warning(disable:4456)
#endif
/*
** Include the configuration header output by 'configure' if we're using the
** autoconf-based build
@ -138111,4 +138122,8 @@ SQLITE_PRIVATE void sqlite3Fts3IcuTokenizerModule(
#endif /* defined(SQLITE_ENABLE_ICU) */
#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */
#ifdef _MSC_VER
#pragma warning(pop)
#endif
/************** End of fts3_icu.c ********************************************/

7
code/ui/ui.vcxproj
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -19,13 +19,13 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@ -82,6 +82,7 @@
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

3854
misc/msvc10/quake3.vcxproj
View file

File diff suppressed because it is too large Load diff