yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-23 21:12:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'dod' into rearrangecalls

Browse source
This commit is contained in:
Denis Pauk 2024-11-19 00:20:00 +02:00
commit 6335606096
74 changed files with 961 additions and 209 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -150,7 +150,7 @@ endif
# Highest supported optimizations are -O2, higher levels # Highest supported optimizations are -O2, higher levels
# will likely break this crappy code. # will likely break this crappy code.
ifdef DEBUG ifdef DEBUG
CFLAGS ?= -O0 -g -Wall -pipe -DDEBUG CFLAGS ?= -O0 -g -Wall -Wpointer-arith -pipe -DDEBUG
ifdef ASAN ifdef ASAN
override CFLAGS += -fsanitize=address -DUSE_SANITIZER override CFLAGS += -fsanitize=address -DUSE_SANITIZER
endif endif
@ -158,7 +158,7 @@ ifdef UBSAN
override CFLAGS += -fsanitize=undefined -DUSE_SANITIZER override CFLAGS += -fsanitize=undefined -DUSE_SANITIZER
endif endif
else else
CFLAGS ?= -O2 -Wall -pipe -fomit-frame-pointer CFLAGS ?= -O2 -Wall -Wpointer-arith -pipe -fomit-frame-pointer
endif endif
# Always needed are: # Always needed are:

11
README.md
View file

@ -13,15 +13,15 @@ Saves format is unstabled and could change between alpha releases.
State: State:
* Localization requires `Q2Game.kpf` file in root directory of game,
* GL1/GLES3/GL3/GL4/VK: * GL1/GLES3/GL3/GL4/VK:
* base1: no known issues, * base1: no known issues,
* base2: no known issues, * base2: no known issues,
* q64/outpost: broken level change,
* mguhub: sometimes broken logic for surface fall in next maps. * mguhub: sometimes broken logic for surface fall in next maps.
* SOFT: * SOFT:
* base1: broken wall light and wall glitch, * base1: broken wall light and wall glitch,
* base2: broken wall light and wall glitch, * base2: broken wall light and wall glitch,
* q64/outpost: broken level change, scale textures unsupported, * q64/outpost: scale textures unsupported,
* mguhub: broken wall light, sometimes broken logic for surface fall * mguhub: broken wall light, sometimes broken logic for surface fall
in next maps. in next maps.
@ -79,7 +79,7 @@ Maps support:
Note: Note:
* Non Quake 2 maps are limmited mostly view only, and could have issues * Non Quake 2 maps are limited mostly view only, and could have issues
with tranparency or some animations flags and properties. with tranparency or some animations flags and properties.
* If you like support some other maps type, create pull request for Mod_Load2QBSP * If you like support some other maps type, create pull request for Mod_Load2QBSP
function and provide a link to demo maps. function and provide a link to demo maps.
@ -150,12 +150,15 @@ Goals:
* [x] MDR model format from Star Trek: Voyager – Elite Force, * [x] MDR model format from Star Trek: Voyager – Elite Force,
* [x] MDA entity format from Anachronox, * [x] MDA entity format from Anachronox,
* [ ] CTC entity format from Anachronox, * [ ] CTC entity format from Anachronox,
* [ ] ATD texture format from Anachronox,
* [ ] MDA model skin selection by tag,
* [ ] SDEF/MDA dynamicaly allocate list of skins,
* [ ] Support material load textures/textureinfo.dat from Anachronox, * [ ] Support material load textures/textureinfo.dat from Anachronox,
* [ ] Support textures/*/*.mat load from ReRelease, * [ ] Support textures/*/*.mat load from ReRelease,
* [ ] Support textures/*/*_glow.png load from ReRelease, * [ ] Support textures/*/*_glow.png load from ReRelease,
* [ ] Support tactile/*/*.bnvib/.wav feedback load from ReRelease, * [ ] Support tactile/*/*.bnvib/.wav feedback load from ReRelease,
* [ ] Fix physics with incorrect floor height in psx/base0.bsp, * [ ] Fix physics with incorrect floor height in psx/base0.bsp,
* [ ] Fix strange white flying boxes in psx/base0.bsp, * [x] Fix strange white flying boxes in psx/base0.bsp,
* [x] RGB particles support instead palette based one, * [x] RGB particles support instead palette based one,
* [x] Get rid of VID_PaletteColor client internal api use, * [x] Get rid of VID_PaletteColor client internal api use,
* [x] Broken maps groups from base2 to next, * [x] Broken maps groups from base2 to next,

4
doc/040_cvarlist.md
View file

@ -249,6 +249,10 @@ it's `+set busywait 0` (setting the `busywait` cvar) and `-portable`
By default this cvar is set to `1`, and will only work if the By default this cvar is set to `1`, and will only work if the
game.dll implements this behaviour. game.dll implements this behaviour.
* **g_language**: Default language for ReRelease game, requires `Q2Game.kpf`
or other source of `localization/loc_english.txt` like file.
Defaults to `english`.
* **g_swap_speed**: Sets the speed of the "changing weapon" animation. * **g_swap_speed**: Sets the speed of the "changing weapon" animation.
Default is `1`. If set to `2`, it will be double the speed, `3` is Default is `1`. If set to `2`, it will be double the speed, `3` is
the triple... up until the max of `8`, since there are at least 2 the triple... up until the max of `8`, since there are at least 2

234
doc/090_filelists.md
View file

@ -35,6 +35,8 @@ level.
/ref_gl1.dll /ref_gl1.dll
/ref_gl3.dll /ref_gl3.dll
/ref_gles3.dll /ref_gles3.dll
/ref_gl4.dll
/ref_vk.dll
/ref_soft.dll /ref_soft.dll
# The Executables: # The Executables:
@ -391,6 +393,238 @@ level.
``` ```
# Remaster
Remaster does not requires files from original release. In game directory
should be placed only files provided with rerelease.
```
/baseq2/music/D_DDTBLU.ogg
/baseq2/music/track02.ogg
/baseq2/music/track03.ogg
/baseq2/music/track04.ogg
/baseq2/music/track05.ogg
/baseq2/music/track06.ogg
/baseq2/music/track07.ogg
/baseq2/music/track08.ogg
/baseq2/music/track09.ogg
/baseq2/music/track10.ogg
/baseq2/music/track11.ogg
/baseq2/music/track12.ogg
/baseq2/music/track13.ogg
/baseq2/music/track14.ogg
/baseq2/music/track15.ogg
/baseq2/music/track16.ogg
/baseq2/music/track17.ogg
/baseq2/music/track18.ogg
/baseq2/music/track19.ogg
/baseq2/music/track20.ogg
/baseq2/music/track21.ogg
/baseq2/music/track64.ogg
/baseq2/music/track65.ogg
/baseq2/music/track66.ogg
/baseq2/music/track67.ogg
/baseq2/music/track68.ogg
/baseq2/music/track69.ogg
/baseq2/music/track70.ogg
/baseq2/music/track71.ogg
/baseq2/music/track72.ogg
/baseq2/music/track73.ogg
/baseq2/music/track74.ogg
/baseq2/music/track75.ogg
/baseq2/music/track76.ogg
/baseq2/music/track77.ogg
/baseq2/music/track78.ogg
/baseq2/music/track79.ogg
/baseq2/video/ects.ogv
/baseq2/video/end_de.srt
/baseq2/video/end_es.srt
/baseq2/video/end_fr.srt
/baseq2/video/end_it.srt
/baseq2/video/end.ogv
/baseq2/video/end_ru.srt
/baseq2/video/end.srt
/baseq2/video/eou1__de.srt
/baseq2/video/eou1__es.srt
/baseq2/video/eou1__fr.srt
/baseq2/video/eou1__it.srt
/baseq2/video/eou1_.ogv
/baseq2/video/eou1__ru.srt
/baseq2/video/eou1_.srt
/baseq2/video/eou2__de.srt
/baseq2/video/eou2__es.srt
/baseq2/video/eou2__fr.srt
/baseq2/video/eou2__it.srt
/baseq2/video/eou2_.ogv
/baseq2/video/eou2__ru.srt
/baseq2/video/eou2_.srt
/baseq2/video/eou3__de.srt
/baseq2/video/eou3__es.srt
/baseq2/video/eou3__fr.srt
/baseq2/video/eou3__it.srt
/baseq2/video/eou3_.ogv
/baseq2/video/eou3__ru.srt
/baseq2/video/eou3_.srt
/baseq2/video/eou4__de.srt
/baseq2/video/eou4__es.srt
/baseq2/video/eou4__fr.srt
/baseq2/video/eou4__it.srt
/baseq2/video/eou4_.ogv
/baseq2/video/eou4__ru.srt
/baseq2/video/eou4_.srt
/baseq2/video/eou5__de.srt
/baseq2/video/eou5__es.srt
/baseq2/video/eou5__fr.srt
/baseq2/video/eou5__it.srt
/baseq2/video/eou5_.ogv
/baseq2/video/eou5__ru.srt
/baseq2/video/eou5_.srt
/baseq2/video/eou6__de.srt
/baseq2/video/eou6__es.srt
/baseq2/video/eou6__fr.srt
/baseq2/video/eou6__it.srt
/baseq2/video/eou6_.ogv
/baseq2/video/eou6__ru.srt
/baseq2/video/eou6_.srt
/baseq2/video/eou7__de.srt
/baseq2/video/eou7__es.srt
/baseq2/video/eou7__fr.srt
/baseq2/video/eou7__it.srt
/baseq2/video/eou7_.ogv
/baseq2/video/eou7__ru.srt
/baseq2/video/eou7_.srt
/baseq2/video/eou8__de.srt
/baseq2/video/eou8__es.srt
/baseq2/video/eou8__fr.srt
/baseq2/video/eou8__it.srt
/baseq2/video/eou8_.ogv
/baseq2/video/eou8__ru.srt
/baseq2/video/eou8_.srt
/baseq2/video/n64/n64l0t.ogv
/baseq2/video/n64/n64l10t.ogv
/baseq2/video/n64/n64l11t.ogv
/baseq2/video/n64/n64l12t.ogv
/baseq2/video/n64/n64l13t.ogv
/baseq2/video/n64/n64l14t.ogv
/baseq2/video/n64/n64l15t.ogv
/baseq2/video/n64/n64l16t.ogv
/baseq2/video/n64/n64l17t.ogv
/baseq2/video/n64/n64l18t.ogv
/baseq2/video/n64/n64l1t.ogv
/baseq2/video/n64/n64l2t.ogv
/baseq2/video/n64/n64l3t.ogv
/baseq2/video/n64/n64l4t.ogv
/baseq2/video/n64/n64l5t.ogv
/baseq2/video/n64/n64l6t.ogv
/baseq2/video/n64/n64l7t.ogv
/baseq2/video/n64/n64l8t.ogv
/baseq2/video/n64/n64l9t.ogv
/baseq2/video/ntro_de.srt
/baseq2/video/ntro_es.srt
/baseq2/video/ntro_fr.srt
/baseq2/video/ntro_it.srt
/baseq2/video/ntro.ogv
/baseq2/video/ntro_ru.srt
/baseq2/video/ntro.srt
/baseq2/video/rend_de.srt
/baseq2/video/rend_es.srt
/baseq2/video/rend_fr.srt
/baseq2/video/rend_it.srt
/baseq2/video/rend.ogv
/baseq2/video/rend_ru.srt
/baseq2/video/rend.srt
/baseq2/video/reu1__de.srt
/baseq2/video/reu1__es.srt
/baseq2/video/reu1__fr.srt
/baseq2/video/reu1__it.srt
/baseq2/video/reu1_.ogv
/baseq2/video/reu1__ru.srt
/baseq2/video/reu1_.srt
/baseq2/video/reu2__de.srt
/baseq2/video/reu2__es.srt
/baseq2/video/reu2__fr.srt
/baseq2/video/reu2__it.srt
/baseq2/video/reu2_.ogv
/baseq2/video/reu2__ru.srt
/baseq2/video/reu2_.srt
/baseq2/video/reu3__de.srt
/baseq2/video/reu3__es.srt
/baseq2/video/reu3__fr.srt
/baseq2/video/reu3__it.srt
/baseq2/video/reu3_.ogv
/baseq2/video/reu3__ru.srt
/baseq2/video/reu3_.srt
/baseq2/video/reu4__de.srt
/baseq2/video/reu4__es.srt
/baseq2/video/reu4__fr.srt
/baseq2/video/reu4__it.srt
/baseq2/video/reu4_.ogv
/baseq2/video/reu4__ru.srt
/baseq2/video/reu4_.srt
/baseq2/video/rintro_de.srt
/baseq2/video/rintro_es.srt
/baseq2/video/rintro_fr.srt
/baseq2/video/rintro_it.srt
/baseq2/video/rintro.ogv
/baseq2/video/rintro_ru.srt
/baseq2/video/rintro.srt
/baseq2/video/xin_de.srt
/baseq2/video/xin_es.srt
/baseq2/video/xin_fr.srt
/baseq2/video/xin_it.srt
/baseq2/video/xin.ogv
/baseq2/video/xin_ru.srt
/baseq2/video/xin.srt
/baseq2/video/xout_de.srt
/baseq2/video/xout_es.srt
/baseq2/video/xout_fr.srt
/baseq2/video/xout_it.srt
/baseq2/video/xout.ogv
/baseq2/video/xout_ru.srt
/baseq2/video/xout.srt
/baseq2/video/xu1_de.srt
/baseq2/video/xu1_es.srt
/baseq2/video/xu1_fr.srt
/baseq2/video/xu1_it.srt
/baseq2/video/xu1.ogv
/baseq2/video/xu1_ru.srt
/baseq2/video/xu1.srt
/baseq2/video/xu2_de.srt
/baseq2/video/xu2_es.srt
/baseq2/video/xu2_fr.srt
/baseq2/video/xu2_it.srt
/baseq2/video/xu2.ogv
/baseq2/video/xu2_ru.srt
/baseq2/video/xu2.srt
/baseq2/video/xu3_de.srt
/baseq2/video/xu3_es.srt
/baseq2/video/xu3_fr.srt
/baseq2/video/xu3_it.srt
/baseq2/video/xu3.ogv
/baseq2/video/xu3_ru.srt
/baseq2/video/xu3.srt
/baseq2/video/xu4_de.srt
/baseq2/video/xu4_es.srt
/baseq2/video/xu4_fr.srt
/baseq2/video/xu4_it.srt
/baseq2/video/xu4.ogv
/baseq2/video/xu4_ru.srt
/baseq2/video/xu4.srt
/baseq2/pak0.pak
/Q2Game.kpf
```
Additionally could be added files from [PSX](https://www.moddb.com/mods/quake-ii-psx)
```
/psx/pak0.pak
/psx/video/psx/boss.ogv
/psx/video/psx/command.ogv
/psx/video/psx/intro.ogv
/psx/video/psx/jail.ogv
/psx/video/psx/power.ogv
```
## Checksums ## Checksums

7
src/client/cl_entities.c
View file

@ -156,7 +156,7 @@ CL_AddPacketEntities(frame_t *frame)
else else
{ {
/* set skin */ /* set skin */
if (s1->modelindex == 255) if (s1->modelindex == CUSTOM_PLAYER_MODEL)
{ {
/* use custom player skin */ /* use custom player skin */
ent.skinnum = 0; ent.skinnum = 0;
@ -198,6 +198,9 @@ CL_AddPacketEntities(frame_t *frame)
ent.skin = NULL; ent.skin = NULL;
ent.model = cl.model_draw[s1->modelindex]; ent.model = cl.model_draw[s1->modelindex];
} }
/* store scale */
VectorCopy(s1->scale, ent.scale);
} }
/* only used for black hole model right now */ /* only used for black hole model right now */
@ -381,7 +384,7 @@ CL_AddPacketEntities(frame_t *frame)
/* duplicate for linked models */ /* duplicate for linked models */
if (s1->modelindex2) if (s1->modelindex2)
{ {
if (s1->modelindex2 == 255) if (s1->modelindex2 == CUSTOM_PLAYER_MODEL)
{ {
/* custom weapon */ /* custom weapon */
ci = &cl.clientinfo[s1->skinnum & 0xff]; ci = &cl.clientinfo[s1->skinnum & 0xff];

32
src/client/cl_parse.c
View file

@ -143,16 +143,35 @@ CL_ParseDelta(entity_state_t *from, entity_state_t *to, int number, int bits)
VectorCopy(from->origin, to->old_origin); VectorCopy(from->origin, to->old_origin);
to->number = number; to->number = number;
if (cls.serverProtocol != PROTOCOL_VERSION)
{
int i;
/* Always set scale to 1.0f for old clients */
for (i = 0; i < 3; i++)
{
to->scale[i] = 1.0f;
}
}
if (IS_QII97_PROTOCOL(cls.serverProtocol)) if (IS_QII97_PROTOCOL(cls.serverProtocol))
{ {
if (bits & U_MODEL) if (bits & U_MODEL)
{ {
to->modelindex = MSG_ReadByte(&net_message); to->modelindex = MSG_ReadByte(&net_message);
if (to->modelindex == QII97_PLAYER_MODEL)
{
to->modelindex = CUSTOM_PLAYER_MODEL;
}
} }
if (bits & U_MODEL2) if (bits & U_MODEL2)
{ {
to->modelindex2 = MSG_ReadByte(&net_message); to->modelindex2 = MSG_ReadByte(&net_message);
if (to->modelindex2 == QII97_PLAYER_MODEL)
{
to->modelindex2 = CUSTOM_PLAYER_MODEL;
}
} }
if (bits & U_MODEL3) if (bits & U_MODEL3)
@ -202,6 +221,19 @@ CL_ParseDelta(entity_state_t *from, entity_state_t *to, int number, int bits)
if ((bits & U_SKIN8) && (bits & U_SKIN16)) if ((bits & U_SKIN8) && (bits & U_SKIN16))
{ {
to->skinnum = MSG_ReadLong(&net_message); to->skinnum = MSG_ReadLong(&net_message);
/* Additional scale with skinnum */
if (cls.serverProtocol == PROTOCOL_VERSION)
{
int i;
for (i = 0; i < 3; i++)
{
to->scale[i] = MSG_ReadFloat(&net_message);
}
printf("received scale %.2fx%.2fx%.2f\n",
to->scale[0], to->scale[1], to->scale[2]);
}
} }
else if (bits & U_SKIN8) else if (bits & U_SKIN8)
{ {

5
src/client/input/sdl2.c
View file

@ -2331,8 +2331,11 @@ IN_GetClipboardText(char *out, size_t n)
SDL_free(s); SDL_free(s);
} }
/* Copy string s to the clipboard.
Returns 0 on success, 1 otherwise.
*/
int int
IN_SetClipboardText(const char *s) IN_SetClipboardText(const char *s)
{ {
return SDL_SetClipboardText(s); return SDL_SetClipboardText(s) != 0;
} }

7
src/client/input/sdl3.c
View file

@ -2437,8 +2437,13 @@ IN_GetClipboardText(char *out, size_t n)
SDL_free(s); SDL_free(s);
} }
/* Copy string s to the clipboard.
Returns 0 on success, 1 otherwise.
*/
int int
IN_SetClipboardText(const char *s) IN_SetClipboardText(const char *s)
{ {
return SDL_SetClipboardText(s); bool res = SDL_SetClipboardText(s);
return !res;
} }

25
src/client/refresh/files/mesh.c
View file

@ -95,12 +95,20 @@ void
R_LerpVerts(qboolean powerUpEffect, int nverts, R_LerpVerts(qboolean powerUpEffect, int nverts,
const dxtrivertx_t *v, const dxtrivertx_t *ov, const dxtrivertx_t *v, const dxtrivertx_t *ov,
float *lerp, const float move[3], float *lerp, const float move[3],
const float frontv[3], const float backv[3]) const float frontv[3], const float backv[3], const float *scale)
{ {
int i; vec3_t new_scale = {1.0, 1.0, 1.0};
scale = new_scale;
if (!scale[0] || !scale[1] || !scale[2])
{
printf("model without scale\n");
}
if (powerUpEffect) if (powerUpEffect)
{ {
int i;
for (i = 0; i < nverts; i++, v++, ov++, lerp += 4) for (i = 0; i < nverts; i++, v++, ov++, lerp += 4)
{ {
int n; int n;
@ -111,18 +119,23 @@ R_LerpVerts(qboolean powerUpEffect, int nverts,
normal = v->normal[n] / 127.f; normal = v->normal[n] / 127.f;
lerp[n] = move[n] + ov->v[n] * backv[n] + v->v[n] * frontv[n] + lerp[n] = scale[n] * (move[n] + ov->v[n] * backv[n] + v->v[n] * frontv[n]) +
normal * POWERSUIT_SCALE; normal * POWERSUIT_SCALE;
} }
} }
} }
else else
{ {
int i;
for (i = 0; i < nverts; i++, v++, ov++, lerp += 4) for (i = 0; i < nverts; i++, v++, ov++, lerp += 4)
{ {
lerp[0] = move[0] + ov->v[0] * backv[0] + v->v[0] * frontv[0]; int n;
lerp[1] = move[1] + ov->v[1] * backv[1] + v->v[1] * frontv[1];
lerp[2] = move[2] + ov->v[2] * backv[2] + v->v[2] * frontv[2]; for (n = 0; n < 3; n++)
{
lerp[n] = scale[n] * (move[n] + ov->v[n] * backv[n] + v->v[n] * frontv[n]);
}
} }
} }
} }

28
src/client/refresh/files/models.c
View file

@ -658,6 +658,9 @@ Mod_LoadFixImages(const char* mod_name, dmdx_t *pheader, qboolean internal)
skin = (char *)pheader + pheader->ofs_skins + i * MAX_SKINNAME; skin = (char *)pheader + pheader->ofs_skins + i * MAX_SKINNAME;
skin[MAX_SKINNAME - 1] = 0; skin[MAX_SKINNAME - 1] = 0;
/* fix skin backslash */
Q_replacebackslash(skin);
R_Printf(PRINT_DEVELOPER, "%s: %s #%d: Should load %s '%s'\n", R_Printf(PRINT_DEVELOPER, "%s: %s #%d: Should load %s '%s'\n",
__func__, mod_name, i, internal ? "internal": "external", skin); __func__, mod_name, i, internal ? "internal": "external", skin);
} }
@ -2895,8 +2898,6 @@ Mod_LoadModel_MDA_Text(const char *mod_name, char *curr_buff,
/* found basemodel */ /* found basemodel */
else if (!strcmp(token, "basemodel")) else if (!strcmp(token, "basemodel"))
{ {
char *curr;
token = COM_Parse(&curr_buff); token = COM_Parse(&curr_buff);
if (!token) if (!token)
{ {
@ -2904,15 +2905,7 @@ Mod_LoadModel_MDA_Text(const char *mod_name, char *curr_buff,
} }
strncpy(base_model, token, sizeof(base_model) - 1); strncpy(base_model, token, sizeof(base_model) - 1);
curr = base_model; Q_replacebackslash(base_model);
while (*curr)
{
if (*curr == '\\')
{
*curr = '/';
}
curr++;
}
if (base_skin[0]) if (base_skin[0])
{ {
@ -2924,7 +2917,6 @@ Mod_LoadModel_MDA_Text(const char *mod_name, char *curr_buff,
else if (!strcmp(token, "map")) else if (!strcmp(token, "map"))
{ {
char* token_end = NULL; char* token_end = NULL;
char *curr;
token = COM_Parse(&curr_buff); token = COM_Parse(&curr_buff);
if (!token) if (!token)
@ -2946,15 +2938,7 @@ Mod_LoadModel_MDA_Text(const char *mod_name, char *curr_buff,
strncpy(base_skin, token, sizeof(base_skin) - 1); strncpy(base_skin, token, sizeof(base_skin) - 1);
curr = base_skin; Q_replacebackslash(base_skin);
while (*curr)
{
if (*curr == '\\')
{
*curr = '/';
}
curr++;
}
if (base_model[0]) if (base_model[0])
{ {
@ -3197,7 +3181,7 @@ Mod_LoadMinMaxUpdate(const char *mod_name, vec3_t mins, vec3_t maxs, void *extra
/* /*
================= =================
Mod_LoadModel Mod_LoadModelFile
================= =================
*/ */
static void * static void *

2
src/client/refresh/files/models_mdr.c
View file

@ -236,7 +236,7 @@ Mod_LoadModel_MDR(const char *mod_name, const void *buffer, int modfilelen,
} }
mdr_lod_t *inlod; mdr_lod_t *inlod;
inlod = (mdr_lod_t*)(buffer + pinmodel.ofs_lods); inlod = (mdr_lod_t*)((byte *)buffer + pinmodel.ofs_lods);
meshofs = inlod->ofs_surfaces; meshofs = inlod->ofs_surfaces;
for (i = 0; i < inlod->num_surfaces; i++) for (i = 0; i < inlod->num_surfaces; i++)

16
src/client/refresh/gl1/gl1_image.c
View file

@ -1139,19 +1139,20 @@ R_LoadPic(const char *name, byte *pic, int width, int realwidth,
* Finds or loads the given image or null * Finds or loads the given image or null
*/ */
image_t * image_t *
R_FindImage(const char *name, imagetype_t type) R_FindImage(const char *originname, imagetype_t type)
{ {
char namewe[256], name[256] = {0};
const char* ext;
image_t *image; image_t *image;
int i, len; int i, len;
char *ptr;
char namewe[256];
const char* ext;
if (!name) if (!originname)
{ {
return NULL; return NULL;
} }
strncpy(name, originname, sizeof(name) - 1);
ext = COM_FileExtension(name); ext = COM_FileExtension(name);
if(!ext[0]) if(!ext[0])
{ {
@ -1171,10 +1172,7 @@ R_FindImage(const char *name, imagetype_t type)
} }
/* fix backslashes */ /* fix backslashes */
while ((ptr = strchr(name, '\\'))) Q_replacebackslash(name);
{
*ptr = '/';
}
/* look for it */ /* look for it */
for (i = 0, image = gltextures; i < numgltextures; i++, image++) for (i = 0, image = gltextures; i < numgltextures; i++, image++)

11
src/client/refresh/gl1/gl1_mesh.c
View file

@ -174,7 +174,7 @@ R_DrawAliasFrameLerp(entity_t *currententity, dmdx_t *paliashdr, float backlerp,
lerp = s_lerped[0]; lerp = s_lerped[0];
R_LerpVerts(colorOnly, paliashdr->num_xyz, verts, ov, lerp, R_LerpVerts(colorOnly, paliashdr->num_xyz, verts, ov, lerp,
move, frontv, backv); move, frontv, backv, currententity->scale);
num_mesh_nodes = paliashdr->num_meshes; num_mesh_nodes = paliashdr->num_meshes;
mesh_nodes = (dmdxmesh_t *)((char*)paliashdr + paliashdr->ofs_meshes); mesh_nodes = (dmdxmesh_t *)((char*)paliashdr + paliashdr->ofs_meshes);
@ -338,6 +338,15 @@ R_DrawAliasModel(entity_t *currententity, const model_t *currentmodel)
} }
} }
for (i = 0; i < 3; i++)
{
/* fix scale */
if (!currententity->scale[i])
{
currententity->scale[i] = 1.0f;
}
}
paliashdr = (dmdx_t *)currentmodel->extradata; paliashdr = (dmdx_t *)currentmodel->extradata;
/* get lighting information */ /* get lighting information */

15
src/client/refresh/gl1/gl1_model.c
View file

@ -397,9 +397,10 @@ Mod_ReadFile(const char *path, void **buffer)
static model_t * static model_t *
Mod_ForName(const char *name, model_t *parent_model, qboolean crash) Mod_ForName(const char *name, model_t *parent_model, qboolean crash)
{ {
char filename[256] = {0}, *tag;
int i, modfilelen;
model_t *mod; model_t *mod;
void *buf; void *buf;
int i, modfilelen;
if (!name[0]) if (!name[0])
{ {
@ -455,8 +456,18 @@ Mod_ForName(const char *name, model_t *parent_model, qboolean crash)
strcpy(mod->name, name); strcpy(mod->name, name);
/* Anachronox has tags in model path*/
strncpy(filename, name, sizeof(filename) - 1);
tag = strstr(filename, ".mda!");
if (tag)
{
tag += 4; /* strlen(.mda) */
*tag = 0;
tag ++;
}
/* load the file */ /* load the file */
modfilelen = ri.Mod_LoadFile(mod->name, &buf); modfilelen = ri.Mod_LoadFile(filename, &buf);
if (!buf) if (!buf)
{ {

5
src/client/refresh/gl1/gl1_surf.c
View file

@ -1090,6 +1090,11 @@ R_RecursiveWorldNode(entity_t *currententity, mnode_t *node)
r_alpha_surfaces = surf; r_alpha_surfaces = surf;
r_alpha_surfaces->texinfo->image = R_TextureAnimation(currententity, surf->texinfo); r_alpha_surfaces->texinfo->image = R_TextureAnimation(currententity, surf->texinfo);
} }
else if (surf->texinfo->flags & SURF_NODRAW)
{
/* Surface should be skipped */
continue;
}
else else
{ {
/* the polygon is visible, so add it to the texture sorted chain */ /* the polygon is visible, so add it to the texture sorted chain */

16
src/client/refresh/gl3/gl3_image.c
View file

@ -609,19 +609,20 @@ GL3_LoadPic(char *name, byte *pic, int width, int realwidth,
* Finds or loads the given image or NULL * Finds or loads the given image or NULL
*/ */
gl3image_t * gl3image_t *
GL3_FindImage(const char *name, imagetype_t type) GL3_FindImage(const char *originname, imagetype_t type)
{ {
char namewe[256], name[256] = {0};
gl3image_t *image; gl3image_t *image;
int i, len;
char *ptr;
char namewe[256];
const char* ext; const char* ext;
int i, len;
if (!name) if (!originname)
{ {
return NULL; return NULL;
} }
strncpy(name, originname, sizeof(name) - 1);
ext = COM_FileExtension(name); ext = COM_FileExtension(name);
if(!ext[0]) if(!ext[0])
{ {
@ -641,10 +642,7 @@ GL3_FindImage(const char *name, imagetype_t type)
} }
/* fix backslashes */ /* fix backslashes */
while ((ptr = strchr(name, '\\'))) Q_replacebackslash(name);
{
*ptr = '/';
}
/* look for it */ /* look for it */
for (i = 0, image = gl3textures; i < numgl3textures; i++, image++) for (i = 0, image = gl3textures; i < numgl3textures; i++, image++)

15
src/client/refresh/gl3/gl3_mesh.c
View file

@ -289,7 +289,8 @@ DrawAliasFrameLerp(dmdx_t *paliashdr, entity_t* entity, vec3_t shadelight,
lerp = s_lerped[0]; lerp = s_lerped[0];
R_LerpVerts(colorOnly, paliashdr->num_xyz, verts, ov, lerp, move, frontv, backv); R_LerpVerts(colorOnly, paliashdr->num_xyz, verts, ov, lerp,
move, frontv, backv, entity->scale);
YQ2_STATIC_ASSERT(sizeof(gl3_alias_vtx_t) == 9 * sizeof(GLfloat), "invalid gl3_alias_vtx_t size"); YQ2_STATIC_ASSERT(sizeof(gl3_alias_vtx_t) == 9 * sizeof(GLfloat), "invalid gl3_alias_vtx_t size");
@ -469,7 +470,8 @@ DrawAliasShadow(gl3_shadowinfo_t* shadowInfo)
// false: don't extrude vertices for powerup - this means the powerup shell // false: don't extrude vertices for powerup - this means the powerup shell
// is not seen in the shadow, only the underlying model.. // is not seen in the shadow, only the underlying model..
R_LerpVerts(false, paliashdr->num_xyz, verts, ov, s_lerped[0], move, frontv, backv); R_LerpVerts(false, paliashdr->num_xyz, verts, ov, s_lerped[0],
move, frontv, backv, entity->scale);
} }
lheight = entity->origin[2] - shadowInfo->lightspot[2]; lheight = entity->origin[2] - shadowInfo->lightspot[2];
@ -546,6 +548,15 @@ GL3_DrawAliasModel(entity_t *entity)
} }
} }
for (i = 0; i < 3; i++)
{
/* fix scale */
if (!entity->scale[i])
{
entity->scale[i] = 1.0f;
}
}
gl3model_t* model = entity->model; gl3model_t* model = entity->model;
paliashdr = (dmdx_t *)model->extradata; paliashdr = (dmdx_t *)model->extradata;

15
src/client/refresh/gl3/gl3_model.c
View file

@ -398,9 +398,10 @@ Mod_ReadFile(const char *path, void **buffer)
static gl3model_t * static gl3model_t *
Mod_ForName(const char *name, gl3model_t *parent_model, qboolean crash) Mod_ForName(const char *name, gl3model_t *parent_model, qboolean crash)
{ {
char filename[256] = {0}, *tag;
int i, modfilelen;
gl3model_t *mod; gl3model_t *mod;
void *buf; void *buf;
int i, modfilelen;
if (!name[0]) if (!name[0])
{ {
@ -456,8 +457,18 @@ Mod_ForName(const char *name, gl3model_t *parent_model, qboolean crash)
strcpy(mod->name, name); strcpy(mod->name, name);
/* Anachronox has tags in model path*/
strncpy(filename, name, sizeof(filename) - 1);
tag = strstr(filename, ".mda!");
if (tag)
{
tag += 4; /* strlen(.mda) */
*tag = 0;
tag ++;
}
/* load the file */ /* load the file */
modfilelen = ri.Mod_LoadFile(mod->name, &buf); modfilelen = ri.Mod_LoadFile(filename, &buf);
if (!buf) if (!buf)
{ {

2
src/client/refresh/gl3/gl3_sdl.c
View file

@ -463,7 +463,7 @@ int GL3_InitContext(void* win)
} }
// Window title - set here so we can display renderer name in it. // Window title - set here so we can display renderer name in it.
char title[40] = {0}; char title[64] = {0};
#ifdef YQ2_GL3_GLES3 #ifdef YQ2_GL3_GLES3
snprintf(title, sizeof(title), "Yamagi Quake II %s - OpenGL ES 3.0", YQ2VERSION); snprintf(title, sizeof(title), "Yamagi Quake II %s - OpenGL ES 3.0", YQ2VERSION);
#else #else

5
src/client/refresh/gl3/gl3_surf.c
View file

@ -729,6 +729,11 @@ RecursiveWorldNode(entity_t *currententity, mnode_t *node)
gl3_alpha_surfaces = surf; gl3_alpha_surfaces = surf;
gl3_alpha_surfaces->texinfo->image = R_TextureAnimation(currententity, surf->texinfo); gl3_alpha_surfaces->texinfo->image = R_TextureAnimation(currententity, surf->texinfo);
} }
else if (surf->texinfo->flags & SURF_NODRAW)
{
/* Surface should be skipped */
continue;
}
else else
{ {
// calling RenderLightmappedPoly() here probably isn't optimal, rendering everything // calling RenderLightmappedPoly() here probably isn't optimal, rendering everything

17
src/client/refresh/gl4/gl4_image.c
View file

@ -610,19 +610,21 @@ GL4_LoadPic(char *name, byte *pic, int width, int realwidth,
* Finds or loads the given image or NULL * Finds or loads the given image or NULL
*/ */
gl4image_t * gl4image_t *
GL4_FindImage(const char *name, imagetype_t type) GL4_FindImage(const char *originname, imagetype_t type)
{ {
char namewe[256], name[256] = {0};
gl4image_t *image; gl4image_t *image;
int i, len;
char *ptr;
char namewe[256];
const char* ext; const char* ext;
int i, len;
if (!name) if (!originname)
{ {
return NULL; return NULL;
} }
strncpy(name, originname, sizeof(name) - 1);
ext = COM_FileExtension(name); ext = COM_FileExtension(name);
if(!ext[0]) if(!ext[0])
{ {
@ -642,10 +644,7 @@ GL4_FindImage(const char *name, imagetype_t type)
} }
/* fix backslashes */ /* fix backslashes */
while ((ptr = strchr(name, '\\'))) Q_replacebackslash(name);
{
*ptr = '/';
}
/* look for it */ /* look for it */
for (i = 0, image = gl4textures; i < numgl4textures; i++, image++) for (i = 0, image = gl4textures; i < numgl4textures; i++, image++)

3
src/client/refresh/gl4/gl4_main.c
View file

@ -1590,9 +1590,6 @@ GL4_RenderView(refdef_t *fd)
GL4_DrawAlphaSurfaces(); GL4_DrawAlphaSurfaces();
// simple gamma correction
glEnable(GL_FRAMEBUFFER_SRGB);
// Note: R_Flash() is now GL4_Draw_Flash() and called from GL4_RenderFrame() // Note: R_Flash() is now GL4_Draw_Flash() and called from GL4_RenderFrame()
if (r_speeds->value) if (r_speeds->value)

15
src/client/refresh/gl4/gl4_mesh.c
View file

@ -289,7 +289,8 @@ DrawAliasFrameLerp(dmdx_t *paliashdr, entity_t* entity, vec3_t shadelight,
lerp = s_lerped[0]; lerp = s_lerped[0];
R_LerpVerts(colorOnly, paliashdr->num_xyz, verts, ov, lerp, move, frontv, backv); R_LerpVerts(colorOnly, paliashdr->num_xyz, verts, ov, lerp,
move, frontv, backv, entity->scale);
YQ2_STATIC_ASSERT(sizeof(gl4_alias_vtx_t) == 9 * sizeof(GLfloat), "invalid gl4_alias_vtx_t size"); YQ2_STATIC_ASSERT(sizeof(gl4_alias_vtx_t) == 9 * sizeof(GLfloat), "invalid gl4_alias_vtx_t size");
@ -469,7 +470,8 @@ DrawAliasShadow(gl4_shadowinfo_t* shadowInfo)
// false: don't extrude vertices for powerup - this means the powerup shell // false: don't extrude vertices for powerup - this means the powerup shell
// is not seen in the shadow, only the underlying model.. // is not seen in the shadow, only the underlying model..
R_LerpVerts(false, paliashdr->num_xyz, verts, ov, s_lerped[0], move, frontv, backv); R_LerpVerts(false, paliashdr->num_xyz, verts, ov, s_lerped[0],
move, frontv, backv, entity->scale);
} }
lheight = entity->origin[2] - shadowInfo->lightspot[2]; lheight = entity->origin[2] - shadowInfo->lightspot[2];
@ -546,6 +548,15 @@ GL4_DrawAliasModel(entity_t *entity)
} }
} }
for (i = 0; i < 3; i++)
{
/* fix scale */
if (!entity->scale[i])
{
entity->scale[i] = 1.0f;
}
}
gl4model_t* model = entity->model; gl4model_t* model = entity->model;
paliashdr = (dmdx_t *)model->extradata; paliashdr = (dmdx_t *)model->extradata;

15
src/client/refresh/gl4/gl4_model.c
View file

@ -398,9 +398,10 @@ Mod_ReadFile(const char *path, void **buffer)
static gl4model_t * static gl4model_t *
Mod_ForName(const char *name, gl4model_t *parent_model, qboolean crash) Mod_ForName(const char *name, gl4model_t *parent_model, qboolean crash)
{ {
char filename[256] = {0}, *tag;
int i, modfilelen;
gl4model_t *mod; gl4model_t *mod;
void *buf; void *buf;
int i, modfilelen;
if (!name[0]) if (!name[0])
{ {
@ -456,8 +457,18 @@ Mod_ForName(const char *name, gl4model_t *parent_model, qboolean crash)
strcpy(mod->name, name); strcpy(mod->name, name);
/* Anachronox has tags in model path*/
strncpy(filename, name, sizeof(filename) - 1);
tag = strstr(filename, ".mda!");
if (tag)
{
tag += 4; /* strlen(.mda) */
*tag = 0;
tag ++;
}
/* load the file */ /* load the file */
modfilelen = ri.Mod_LoadFile(mod->name, &buf); modfilelen = ri.Mod_LoadFile(filename, &buf);
if (!buf) if (!buf)
{ {

5
src/client/refresh/gl4/gl4_surf.c
View file

@ -726,6 +726,11 @@ RecursiveWorldNode(entity_t *currententity, mnode_t *node)
gl4_alpha_surfaces = surf; gl4_alpha_surfaces = surf;
gl4_alpha_surfaces->texinfo->image = R_TextureAnimation(currententity, surf->texinfo); gl4_alpha_surfaces->texinfo->image = R_TextureAnimation(currententity, surf->texinfo);
} }
else if (surf->texinfo->flags & SURF_NODRAW)
{
/* Surface should be skipped */
continue;
}
else else
{ {
// calling RenderLightmappedPoly() here probably isn't optimal, rendering everything // calling RenderLightmappedPoly() here probably isn't optimal, rendering everything

2
src/client/refresh/ref_shared.h
View file

@ -382,7 +382,7 @@ extern qboolean R_CullAliasMeshModel(dmdx_t *paliashdr, cplane_t *frustum,
extern void R_LerpVerts(qboolean powerUpEffect, int nverts, extern void R_LerpVerts(qboolean powerUpEffect, int nverts,
const dxtrivertx_t *v, const dxtrivertx_t *ov, const dxtrivertx_t *v, const dxtrivertx_t *ov,
float *lerp, const float move[3], float *lerp, const float move[3],
const float frontv[3], const float backv[3]); const float frontv[3], const float backv[3], const float *scale);
extern void R_ConvertNormalMDL(byte in_normal, signed char *normal); extern void R_ConvertNormalMDL(byte in_normal, signed char *normal);
extern vec4_t *R_VertBufferRealloc(int num); extern vec4_t *R_VertBufferRealloc(int num);
extern void R_VertBufferInit(void); extern void R_VertBufferInit(void);

19
src/client/refresh/soft/sw_alias.c
View file

@ -457,7 +457,7 @@ R_AliasPreparePoints(const entity_t *currententity, finalvert_t *verts, const fi
RF_SHELL_HALF_DAM)); RF_SHELL_HALF_DAM));
R_LerpVerts(colorOnly, s_pmdl->num_xyz, r_thisframe->verts, r_lastframe->verts, R_LerpVerts(colorOnly, s_pmdl->num_xyz, r_thisframe->verts, r_lastframe->verts,
s_lerped[0], r_lerp_move, r_lerp_frontv, r_lerp_backv); s_lerped[0], r_lerp_move, r_lerp_frontv, r_lerp_backv, currententity->scale);
R_AliasTransformFinalVerts(s_pmdl->num_xyz, R_AliasTransformFinalVerts(s_pmdl->num_xyz,
verts, /* destination for transformed verts */ verts, /* destination for transformed verts */
@ -795,17 +795,21 @@ R_AliasDrawModel
void void
R_AliasDrawModel(entity_t *currententity, const model_t *currentmodel) R_AliasDrawModel(entity_t *currententity, const model_t *currentmodel)
{ {
int i;
s_pmdl = (dmdx_t *)currentmodel->extradata; s_pmdl = (dmdx_t *)currentmodel->extradata;
if ( r_lerpmodels->value == 0 ) if ( r_lerpmodels->value == 0 )
{
currententity->backlerp = 0; currententity->backlerp = 0;
}
float oldAliasxscale = aliasxscale; float oldAliasxscale = aliasxscale;
float oldAliasyscale = aliasyscale; float oldAliasyscale = aliasyscale;
if ( currententity->flags & RF_WEAPONMODEL ) if (currententity->flags & RF_WEAPONMODEL)
{ {
if ( r_lefthand->value == 2.0F ) if (r_lefthand->value == 2.0F)
{ {
return; return;
} }
@ -821,6 +825,15 @@ R_AliasDrawModel(entity_t *currententity, const model_t *currentmodel)
aliasxscale = -aliasxscale; aliasxscale = -aliasxscale;
} }
for (i = 0; i < 3; i++)
{
/* fix scale */
if (!currententity->scale[i])
{
currententity->scale[i] = 1.0f;
}
}
/* /*
** we have to set our frame pointers and transformations before ** we have to set our frame pointers and transformations before
** doing any real work ** doing any real work

6
src/client/refresh/soft/sw_bsp.c
View file

@ -322,7 +322,7 @@ R_DrawSolidClippedSubmodelPolygons(entity_t *currententity, const model_t *curre
numsurfaces = currentmodel->nummodelsurfaces; numsurfaces = currentmodel->nummodelsurfaces;
pedges = currentmodel->edges; pedges = currentmodel->edges;
for (i=0 ; i<numsurfaces ; i++, psurf++) for (i = 0; i < numsurfaces; i++, psurf++)
{ {
cplane_t *pplane; cplane_t *pplane;
bedge_t *pbedge; bedge_t *pbedge;
@ -337,7 +337,9 @@ R_DrawSolidClippedSubmodelPolygons(entity_t *currententity, const model_t *curre
// draw the polygon // draw the polygon
if (( !(psurf->flags & SURF_PLANEBACK) && (dot < -BACKFACE_EPSILON)) || if (( !(psurf->flags & SURF_PLANEBACK) && (dot < -BACKFACE_EPSILON)) ||
((psurf->flags & SURF_PLANEBACK) && (dot > BACKFACE_EPSILON))) ((psurf->flags & SURF_PLANEBACK) && (dot > BACKFACE_EPSILON)))
{
continue; continue;
}
// FIXME: use bounding-box-based frustum clipping info? // FIXME: use bounding-box-based frustum clipping info?
@ -349,7 +351,7 @@ R_DrawSolidClippedSubmodelPolygons(entity_t *currententity, const model_t *curre
pbedge = &bedges[numbedges]; pbedge = &bedges[numbedges];
numbedges += psurf->numedges; numbedges += psurf->numedges;
for (j=0 ; j<psurf->numedges ; j++) for (j = 0; j < psurf->numedges; j++)
{ {
int lindex; int lindex;

18
src/client/refresh/soft/sw_image.c
View file

@ -548,19 +548,20 @@ Finds or loads the given image or NULL
=============== ===============
*/ */
image_t * image_t *
R_FindImage(const char *name, imagetype_t type) R_FindImage(const char *originname, imagetype_t type)
{ {
image_t *image; char namewe[256], name[256] = {0};
int i, len;
char *ptr;
char namewe[256];
const char* ext; const char* ext;
image_t *image;
int i, len;
if (!name) if (!originname)
{ {
return NULL; return NULL;
} }
strncpy(name, originname, sizeof(name) - 1);
/* just return white image if show lightmap only */ /* just return white image if show lightmap only */
if ((type == it_wall || type == it_skin) && r_lightmap->value) if ((type == it_wall || type == it_skin) && r_lightmap->value)
{ {
@ -586,10 +587,7 @@ R_FindImage(const char *name, imagetype_t type)
} }
/* fix backslashes */ /* fix backslashes */
while ((ptr = strchr(name, '\\'))) Q_replacebackslash(name);
{
*ptr = '/';
}
// look for it // look for it
for (i=0, image=r_images ; i<numr_images ; i++,image++) for (i=0, image=r_images ; i<numr_images ; i++,image++)

15
src/client/refresh/soft/sw_model.c
View file

@ -405,9 +405,10 @@ Mod_ReadFile(const char *path, void **buffer)
static model_t * static model_t *
Mod_ForName(const char *name, model_t *parent_model, qboolean crash) Mod_ForName(const char *name, model_t *parent_model, qboolean crash)
{ {
char filename[256] = {0}, *tag;
int i, modfilelen;
model_t *mod; model_t *mod;
void *buf; void *buf;
int i, modfilelen;
if (!name[0]) if (!name[0])
{ {
@ -463,8 +464,18 @@ Mod_ForName(const char *name, model_t *parent_model, qboolean crash)
strcpy(mod->name, name); strcpy(mod->name, name);
/* Anachronox has tags in model path*/
strncpy(filename, name, sizeof(filename) - 1);
tag = strstr(filename, ".mda!");
if (tag)
{
tag += 4; /* strlen(.mda) */
*tag = 0;
tag ++;
}
/* load the file */ /* load the file */
modfilelen = ri.Mod_LoadFile(mod->name, &buf); modfilelen = ri.Mod_LoadFile(filename, &buf);
if (!buf) if (!buf)
{ {

6
src/client/refresh/soft/sw_rast.c
View file

@ -536,6 +536,12 @@ R_RenderFace (entity_t *currententity, const model_t *currentmodel, msurface_t *
return; return;
} }
if (fa->texinfo->flags & SURF_NODRAW)
{
/* Surface should be skipped */
return;
}
// sky surfaces encountered in the world will cause the // sky surfaces encountered in the world will cause the
// environment box surfaces to be emited // environment box surfaces to be emited
if ( fa->texinfo->flags & SURF_SKY ) if ( fa->texinfo->flags & SURF_SKY )

18
src/client/refresh/vk/vk_image.c
View file

@ -1191,19 +1191,20 @@ Finds or loads the given image or NULL
=============== ===============
*/ */
image_t * image_t *
Vk_FindImage(const char *name, imagetype_t type) Vk_FindImage(const char *originname, imagetype_t type)
{ {
image_t *image; char namewe[256], name[256] = {0};
int i, len;
char *ptr;
char namewe[256];
const char* ext; const char* ext;
image_t *image;
int i, len;
if (!name) if (!originname)
{ {
return NULL; return NULL;
} }
strncpy(name, originname, sizeof(name) - 1);
ext = COM_FileExtension(name); ext = COM_FileExtension(name);
if(!ext[0]) if(!ext[0])
{ {
@ -1222,10 +1223,7 @@ Vk_FindImage(const char *name, imagetype_t type)
memcpy(namewe, name, len - (strlen(ext) + 1)); memcpy(namewe, name, len - (strlen(ext) + 1));
/* fix backslashes */ /* fix backslashes */
while ((ptr = strchr(name, '\\'))) Q_replacebackslash(name);
{
*ptr = '/';
}
/* look for it */ /* look for it */
for (i=0, image=vktextures ; i<numvktextures ; i++,image++) for (i=0, image=vktextures ; i<numvktextures ; i++,image++)

2
src/client/refresh/vk/vk_main.c
View file

@ -983,7 +983,7 @@ RE_RenderView(refdef_t *fd)
R_DrawAlphaSurfaces(); R_DrawAlphaSurfaces();
R_Flash(); R_Flash(); /* citadel error */
if (r_speeds->value) if (r_speeds->value)
{ {

11
src/client/refresh/vk/vk_mesh.c
View file

@ -359,7 +359,7 @@ Vk_DrawAliasFrameLerp(entity_t *currententity, dmdx_t *paliashdr, float backlerp
} }
R_LerpVerts(colorOnly, paliashdr->num_xyz, verts, ov, (float*)s_lerped, R_LerpVerts(colorOnly, paliashdr->num_xyz, verts, ov, (float*)s_lerped,
move, frontv, backv); move, frontv, backv, currententity->scale);
VkDescriptorSet descriptorSets[] = { VkDescriptorSet descriptorSets[] = {
skin->vk_texture.descriptorSet, skin->vk_texture.descriptorSet,
@ -528,6 +528,15 @@ R_DrawAliasModel(entity_t *currententity, const model_t *currentmodel)
} }
} }
for (i = 0; i < 3; i++)
{
/* fix scale */
if (!currententity->scale[i])
{
currententity->scale[i] = 1.0f;
}
}
paliashdr = (dmdx_t *)currentmodel->extradata; paliashdr = (dmdx_t *)currentmodel->extradata;
/* get lighting information */ /* get lighting information */

15
src/client/refresh/vk/vk_model.c
View file

@ -372,9 +372,10 @@ Mod_ReadFile(const char *path, void **buffer)
static model_t * static model_t *
Mod_ForName(const char *name, model_t *parent_model, qboolean crash) Mod_ForName(const char *name, model_t *parent_model, qboolean crash)
{ {
char filename[256] = {0}, *tag;
int i, modfilelen;
model_t *mod; model_t *mod;
void *buf; void *buf;
int i, modfilelen;
if (!name[0]) if (!name[0])
{ {
@ -430,8 +431,18 @@ Mod_ForName(const char *name, model_t *parent_model, qboolean crash)
strcpy(mod->name, name); strcpy(mod->name, name);
/* Anachronox has tags in model path*/
strncpy(filename, name, sizeof(filename) - 1);
tag = strstr(filename, ".mda!");
if (tag)
{
tag += 4; /* strlen(.mda) */
*tag = 0;
tag ++;
}
/* load the file */ /* load the file */
modfilelen = ri.Mod_LoadFile(mod->name, &buf); modfilelen = ri.Mod_LoadFile(filename, &buf);
if (!buf) if (!buf)
{ {

5
src/client/refresh/vk/vk_surf.c
View file

@ -743,6 +743,11 @@ R_RecursiveWorldNode(entity_t *currententity, mnode_t *node)
surf->texturechain = r_alpha_surfaces; surf->texturechain = r_alpha_surfaces;
r_alpha_surfaces = surf; r_alpha_surfaces = surf;
} }
else if (surf->texinfo->flags & SURF_NODRAW)
{
/* Surface should be skipped */
continue;
}
else else
{ {
if (!(surf->flags & SURF_DRAWTURB) && !r_showtris->value) if (!(surf->flags & SURF_DRAWTURB) && !r_showtris->value)

1
src/client/vid/header/ref.h
View file

@ -68,6 +68,7 @@ typedef struct entity_s {
/* misc */ /* misc */
float backlerp; /* 0.0 = current, 1.0 = old */ float backlerp; /* 0.0 = current, 1.0 = old */
int skinnum; /* also used as RF_BEAM's palette index */ int skinnum; /* also used as RF_BEAM's palette index */
vec3_t scale; /* model scale before render */
int lightstyle; /* for flashing entities */ int lightstyle; /* for flashing entities */
float alpha; /* ignore if RF_TRANSLUCENT isn't set */ float alpha; /* ignore if RF_TRANSLUCENT isn't set */

1
src/common/cmodels.c
View file

@ -69,6 +69,7 @@ Mod_LoadVisibility(const char *name, dvis_t **vis, int *numvisibility,
if (!l->filelen) if (!l->filelen)
{ {
/* n64jam_chnuckierdbeer */
Com_Printf("%s: Map %s has too small visibility lump\n", Com_Printf("%s: Map %s has too small visibility lump\n",
__func__, name); __func__, name);
*vis = NULL; *vis = NULL;

33
src/common/filesystem.c
View file

@ -655,7 +655,7 @@ FS_DecompressFile(void *buffer, int size, const fsHandle_t *handle)
return 0; return 0;
} }
memmove(buffer + written, comressed_buffer + read, x + 1); memmove((byte *)buffer + written, comressed_buffer + read, x + 1);
read += x + 1; read += x + 1;
written += x + 1; written += x + 1;
@ -670,7 +670,7 @@ FS_DecompressFile(void *buffer, int size, const fsHandle_t *handle)
return 0; return 0;
} }
memset(buffer + written, 0, x - 62); memset((byte *)buffer + written, 0, x - 62);
written += x - 62; written += x - 62;
} }
@ -684,7 +684,7 @@ FS_DecompressFile(void *buffer, int size, const fsHandle_t *handle)
return 0; return 0;
} }
memset(buffer + written, comressed_buffer[read], x - 126); memset((byte *)buffer + written, comressed_buffer[read], x - 126);
++read; ++read;
written += x - 126; written += x - 126;
@ -699,7 +699,7 @@ FS_DecompressFile(void *buffer, int size, const fsHandle_t *handle)
return 0; return 0;
} }
memmove(buffer + written, (buffer + written) - ( memmove((byte *)buffer + written, ((byte *)buffer + written) - (
(int)comressed_buffer[read] + 2), x - 190); (int)comressed_buffer[read] + 2), x - 190);
++read; ++read;
@ -1079,7 +1079,6 @@ FS_LoadDAT(const char *packPath)
for (i = 0; i < numFiles; i++) for (i = 0; i < numFiles; i++)
{ {
int name_len; int name_len;
char* p;
/* name */ /* name */
memcpy(files[i].name, prefix, prefix_size); memcpy(files[i].name, prefix, prefix_size);
@ -1090,15 +1089,7 @@ FS_LoadDAT(const char *packPath)
files[i].name[prefix_size + name_len + 1] = 0; files[i].name[prefix_size + name_len + 1] = 0;
/* fix naming */ /* fix naming */
p = files[i].name; Q_replacebackslash(files[i].name);
while (*p)
{
if (*p == '\\')
{
*p = '/';
}
p ++;
}
printf("file: %s\n", files[i].name); printf("file: %s\n", files[i].name);
@ -2024,6 +2015,7 @@ FS_Dir_f(void)
char **dirnames; /* File list. */ char **dirnames; /* File list. */
char findname[1024]; /* File search path and pattern. */ char findname[1024]; /* File search path and pattern. */
char *path = NULL; /* Search path. */ char *path = NULL; /* Search path. */
char *lastsep;
char wildcard[1024] = "*.*"; /* File pattern. */ char wildcard[1024] = "*.*"; /* File pattern. */
int i; /* Loop counter. */ int i; /* Loop counter. */
int ndirs; /* Number of files in list. */ int ndirs; /* Number of files in list. */
@ -2045,9 +2037,10 @@ FS_Dir_f(void)
{ {
for (i = 0; i < ndirs - 1; i++) for (i = 0; i < ndirs - 1; i++)
{ {
if (strrchr(dirnames[i], '/')) lastsep = strrchr(dirnames[i], '/');
if (lastsep)
{ {
Com_Printf("%s\n", strrchr(dirnames[i], '/') + 1); Com_Printf("%s\n", lastsep + 1);
} }
else else
{ {
@ -2590,13 +2583,7 @@ static void FS_AddDirToRawPath (const char *rawdir, qboolean create, qboolean re
} }
// Convert backslashes to forward slashes. // Convert backslashes to forward slashes.
for (int i = 0; i < strlen(dir); i++) Q_replacebackslash(dir);
{
if (dir[i] == '\\')
{
dir[i] = '/';
}
}
// Make sure that the dir doesn't end with a slash. // Make sure that the dir doesn't end with a slash.
for (size_t s = strlen(dir) - 1; s > 0; s--) for (size_t s = strlen(dir) - 1; s > 0; s--)

3
src/common/header/common.h
View file

@ -190,6 +190,9 @@ void Info_Print(char *s);
/* Quake 2 Customized Network Release */ /* Quake 2 Customized Network Release */
#define PROTOCOL_VERSION 2024 #define PROTOCOL_VERSION 2024
/* Quake 2 originaly uses 255 as player model */
#define QII97_PLAYER_MODEL 255
#define IS_QII97_PROTOCOL(x) ( \ #define IS_QII97_PROTOCOL(x) ( \
((x) == PROTOCOL_RELEASE_VERSION) || \ ((x) == PROTOCOL_RELEASE_VERSION) || \
((x) == PROTOCOL_DEMO_VERSION) || \ ((x) == PROTOCOL_DEMO_VERSION) || \

8
src/common/header/flags.h
View file

@ -196,7 +196,7 @@ static const int daikatana_flags[32] = {
0, /* 16: Mirror */ 0, /* 16: Mirror */
0, /* 17: Holy Grond */ 0, /* 17: Holy Grond */
SURF_ALPHATEST, /* 18: Alphachan */ SURF_ALPHATEST, /* 18: Alphachan */
0, /* 19: Midtexture (Used together with Clear and Nodraw.) */ SURF_ALPHATEST, /* 19: Midtexture (Used together with Clear and Nodraw.) */
0, /* 20: Puddle */ 0, /* 20: Puddle */
0, /* 21: Water Surge */ 0, /* 21: Water Surge */
0, /* 22: Big Water Surge */ 0, /* 22: Big Water Surge */
@ -214,15 +214,15 @@ static const int daikatana_flags[32] = {
static const int daikatana_contents_flags[32] = { static const int daikatana_contents_flags[32] = {
CONTENTS_SOLID, /* 0: Default for all brushes */ CONTENTS_SOLID, /* 0: Default for all brushes */
CONTENTS_WINDOW, /* 1: Brush is a window (not really used) */ CONTENTS_WINDOW, /* 1: Brush is a window (not really used) */
0, /* 2: Unused by the Dk's engine? */ CONTENTS_AUX, /* 2: Unused by the Dk's engine? */
CONTENTS_LAVA, /* 3: The brush is lava */ CONTENTS_LAVA, /* 3: The brush is lava */
CONTENTS_SLIME, /* 4: The brush is slime */ CONTENTS_SLIME, /* 4: The brush is slime */
CONTENTS_WATER, /* 5: The brush is water */ CONTENTS_WATER, /* 5: The brush is water */
CONTENTS_MIST, /* 6: The brush is non-solid */ CONTENTS_MIST, /* 6: The brush is non-solid */
0, /* 7: clear */ CONTENTS_SOLID, /* 7: clear */
0, /* 8: notsolid */ 0, /* 8: notsolid */
0, /* 9: noshoot */ 0, /* 9: noshoot */
0, /* 10: fog */ CONTENTS_MIST, /* 10: fog */
0, /* 11: nitro */ 0, /* 11: nitro */
0, /* 12: Unused */ 0, /* 12: Unused */
0, /* 13: Unused */ 0, /* 13: Unused */

6
src/common/header/shared.h
View file

@ -178,6 +178,7 @@ typedef unsigned char byte;
#define MAX_IMAGES 256 #define MAX_IMAGES 256
#define MAX_ITEMS 256 #define MAX_ITEMS 256
#define MAX_GENERAL (MAX_CLIENTS * 2) /* general config strings */ #define MAX_GENERAL (MAX_CLIENTS * 2) /* general config strings */
#define CUSTOM_PLAYER_MODEL (MAX_MODELS - 1)
/* game print flags */ /* game print flags */
#define PRINT_LOW 0 /* pickup messages */ #define PRINT_LOW 0 /* pickup messages */
@ -342,6 +343,9 @@ void Q_strdel(char *s, size_t i, size_t n);
size_t Q_strins(char *dest, const char *src, size_t i, size_t n); size_t Q_strins(char *dest, const char *src, size_t i, size_t n);
qboolean Q_strisnum(const char *s); qboolean Q_strisnum(const char *s);
/* fix backslashes in path */
void Q_replacebackslash(char *curr);
/* ============================================= */ /* ============================================= */
/* Unicode wrappers that also make sure it's a regular file around fopen(). */ /* Unicode wrappers that also make sure it's a regular file around fopen(). */
@ -1218,6 +1222,8 @@ typedef struct entity_state_s
int event; /* impulse events -- muzzle flashes, footsteps, etc */ int event; /* impulse events -- muzzle flashes, footsteps, etc */
/* events only go out for a single frame, they */ /* events only go out for a single frame, they */
/* are automatically cleared each frame */ /* are automatically cleared each frame */
/* New protocol fields */
vec3_t scale;
} entity_state_t; } entity_state_t;
/* ============================================== */ /* ============================================== */

7
src/common/maps.c
View file

@ -68,6 +68,7 @@ Mod_LoadSurfConvertFlags(int flags, maptype_t maptype)
case map_kingpin: convert = kingpin_flags; break; case map_kingpin: convert = kingpin_flags; break;
case map_anachronox: convert = anachronox_flags; break; case map_anachronox: convert = anachronox_flags; break;
case map_sin: convert = sin_flags; break; case map_sin: convert = sin_flags; break;
case map_quake2: convert = quake2_flags; break;
default: convert = NULL; break; default: convert = NULL; break;
} }
@ -283,6 +284,9 @@ Mod_Load2QBSP_IBSP_TEXINFO(byte *outbuf, dheader_t *outheader,
strncpy(out->texture, in->texture, strncpy(out->texture, in->texture,
Q_min(sizeof(out->texture), sizeof(in->texture))); Q_min(sizeof(out->texture), sizeof(in->texture)));
/* Fix backslashes */
Q_replacebackslash(out->texture);
out++; out++;
in++; in++;
} }
@ -316,6 +320,9 @@ Mod_Load2QBSP_RBSP_TEXINFO(byte *outbuf, dheader_t *outheader,
strncpy(out->texture, in->texture, strncpy(out->texture, in->texture,
Q_min(sizeof(out->texture), sizeof(in->texture))); Q_min(sizeof(out->texture), sizeof(in->texture)));
/* Fix backslashes */
Q_replacebackslash(out->texture);
out++; out++;
in++; in++;
} }

41
src/common/movemsg.c
View file

@ -505,6 +505,13 @@ MSG_WriteDeltaEntity(entity_state_t *from,
} }
} }
/* Scale with skins if force or different */
if ((protocol == PROTOCOL_VERSION) &&
((to->scale != from->scale) || force))
{
bits |= (U_SKIN8 | U_SKIN16);
}
if (to->frame != from->frame) if (to->frame != from->frame)
{ {
if (to->frame < 256) if (to->frame < 256)
@ -650,12 +657,28 @@ MSG_WriteDeltaEntity(entity_state_t *from,
{ {
if (bits & U_MODEL) if (bits & U_MODEL)
{ {
MSG_WriteByte(msg, to->modelindex); int modelindex = to->modelindex;
/* New protocol use 16 bit for model id, and custom player model
* id is different to old one, converty back */
if (modelindex == CUSTOM_PLAYER_MODEL)
{
modelindex = QII97_PLAYER_MODEL;
}
MSG_WriteByte(msg, modelindex);
} }
if (bits & U_MODEL2) if (bits & U_MODEL2)
{ {
MSG_WriteByte(msg, to->modelindex2); int modelindex = to->modelindex2;
/* New protocol use 16 bit for model id, and custom player model
* id is different to old one, converty back */
if (modelindex == CUSTOM_PLAYER_MODEL)
{
modelindex = QII97_PLAYER_MODEL;
}
MSG_WriteByte(msg, modelindex);
} }
if (bits & U_MODEL3) if (bits & U_MODEL3)
@ -704,6 +727,20 @@ MSG_WriteDeltaEntity(entity_state_t *from,
if ((bits & U_SKIN8) && (bits & U_SKIN16)) /*used for laser colors */ if ((bits & U_SKIN8) && (bits & U_SKIN16)) /*used for laser colors */
{ {
MSG_WriteLong(msg, to->skinnum); MSG_WriteLong(msg, to->skinnum);
/* Send scale */
if (protocol == PROTOCOL_VERSION)
{
int i;
for (i = 0; i < 3; i++)
{
MSG_WriteFloat(msg, to->scale[i]);
}
printf("send scale %.2fx%.2fx%.2f\n",
to->scale[0], to->scale[1], to->scale[2]);
}
} }
else if (bits & U_SKIN8) else if (bits & U_SKIN8)

20
src/common/shared/shared.c
View file

@ -581,9 +581,10 @@ double sqrt(double x);
vec_t vec_t
VectorLength(const vec3_t v) VectorLength(const vec3_t v)
{ {
return sqrtf((v[0] * v[0]) + return sqrtf(
(v[1] * v[1]) + (v[0] * v[0]) +
(v[2] * v[2])); (v[1] * v[1]) +
(v[2] * v[2]));
} }
void void
@ -1084,6 +1085,19 @@ Q_strcasecmp(const char *s1, const char *s2)
return Q_strncasecmp(s1, s2, 99999); return Q_strncasecmp(s1, s2, 99999);
} }
void
Q_replacebackslash(char *curr)
{
while (*curr)
{
if (*curr == '\\')
{
*curr = '/';
}
curr++;
}
}
void void
Com_sprintf(char *dest, int size, const char *fmt, ...) Com_sprintf(char *dest, int size, const char *fmt, ...)
{ {

2
src/game/g_ctf.c
View file

@ -1198,7 +1198,7 @@ CTFFlagSetup(edict_t *ent)
if (tr.startsolid) if (tr.startsolid)
{ {
gi.dprintf("CTFFlagSetup: %s startsolid at %s\n", ent->classname, gi.dprintf("%s: %s startsolid at %s\n", __func__, ent->classname,
vtos(ent->s.origin)); vtos(ent->s.origin));
G_FreeEdict(ent); G_FreeEdict(ent);
return; return;

136
src/game/g_items.c
View file

@ -1931,6 +1931,57 @@ Use_Item(edict_t *ent, edict_t *other /* unused */, edict_t *activator /* unused
/* ====================================================================== */ /* ====================================================================== */
static void
FixObjectPosition(edict_t *ent)
{
int i;
for (i = 0; i < 3; i++)
{
int j;
for (j = 0; j < 3; j++)
{
vec3_t pos;
trace_t tr_pos;
int k;
VectorCopy(ent->s.origin, pos);
/* move by min */
for (k = 0; k < i + 1; k++)
{
int v;
v = (j + k) % 3;
pos[v] = ent->s.origin[v] - ent->mins[v];
}
tr_pos = gi.trace(pos, ent->mins, ent->maxs, ent->s.origin, ent, MASK_SOLID);
if (!tr_pos.startsolid)
{
VectorCopy(tr_pos.endpos, ent->s.origin);
return;
}
/* move by max */
for (k = 0; k < i + 1; k++)
{
int v;
v = (j + k) % 3;
pos[v] = ent->s.origin[v] - ent->maxs[v];
}
tr_pos = gi.trace(pos, ent->mins, ent->maxs, ent->s.origin, ent, MASK_SOLID);
if (!tr_pos.startsolid)
{
VectorCopy(tr_pos.endpos, ent->s.origin);
return;
}
}
}
}
void void
droptofloor(edict_t *ent) droptofloor(edict_t *ent)
{ {
@ -1966,6 +2017,13 @@ droptofloor(edict_t *ent)
tr = gi.trace(ent->s.origin, ent->mins, ent->maxs, dest, ent, MASK_SOLID); tr = gi.trace(ent->s.origin, ent->mins, ent->maxs, dest, ent, MASK_SOLID);
if (tr.startsolid)
{
FixObjectPosition(ent);
tr = gi.trace(ent->s.origin, ent->mins, ent->maxs, dest, ent, MASK_SOLID);
}
if (tr.startsolid) if (tr.startsolid)
{ {
if (strcmp(ent->classname, "foodcube") == 0) if (strcmp(ent->classname, "foodcube") == 0)
@ -1975,7 +2033,8 @@ droptofloor(edict_t *ent)
} }
else else
{ {
gi.dprintf("droptofloor: %s startsolid at %s\n", gi.dprintf("%s: %s startsolid at %s\n",
__func__,
ent->classname, ent->classname,
vtos(ent->s.origin)); vtos(ent->s.origin));
G_FreeEdict(ent); G_FreeEdict(ent);
@ -3761,6 +3820,81 @@ static const gitem_t gameitemlist[] = {
"" ""
}, },
/*
* QUAKED key_explosive_charges (0 .5 .8) (-16 -16 -16) (16 16 16) TRIGGER_SPAWN NO_TOUCH
* warehouse circuits, key for N64
*/
{
"key_explosive_charges",
Pickup_Key,
NULL,
Drop_General,
NULL,
"items/pkup.wav",
"models/items/n64/charge/tris.md2", EF_ROTATE,
NULL,
"n64/i_charges",
"Explosive Charges",
2,
0,
NULL,
IT_STAY_COOP | IT_KEY,
0,
NULL,
0,
""
},
/*
* QUAKED key_yellow_key (0 .5 .8) (-16 -16 -16) (16 16 16)
* normal door key - yellow, key for N64
*/
{
"key_yellow_key",
Pickup_Key,
NULL,
Drop_General,
NULL,
"items/pkup.wav",
"models/items/n64/yellow_key/tris.md2", EF_ROTATE,
NULL,
"n64/i_yellow_key",
"Yellow Key",
2,
0,
NULL,
IT_STAY_COOP | IT_KEY,
0,
NULL,
0,
""
},
/*
* QUAKED key_power_core (0 .5 .8) (-16 -16 -16) (16 16 16)
* key for N64
*/
{
"key_power_core",
Pickup_Key,
NULL,
Drop_General,
NULL,
"items/pkup.wav",
"models/items/n64/power_core/tris.md2", EF_ROTATE,
NULL,
"k_pyramid",
"Power Core",
2,
0,
NULL,
IT_STAY_COOP | IT_KEY,
0,
NULL,
0,
""
},
/* /*
* QUAKED key_pyramid (0 .5 .8) (-16 -16 -16) (16 16 16) TRIGGER_SPAWN * QUAKED key_pyramid (0 .5 .8) (-16 -16 -16) (16 16 16) TRIGGER_SPAWN
* key for the entrance of jail3 * key for the entrance of jail3

1
src/game/g_main.c
View file

@ -102,6 +102,7 @@ cvar_t *aimfix;
cvar_t *g_machinegun_norecoil; cvar_t *g_machinegun_norecoil;
cvar_t *g_quick_weap; cvar_t *g_quick_weap;
cvar_t *g_swap_speed; cvar_t *g_swap_speed;
cvar_t *g_language;
static void G_RunFrame(void); static void G_RunFrame(void);

13
src/game/g_misc.c
View file

@ -3297,13 +3297,17 @@ misc_flare_use(edict_t *ent, edict_t *other, edict_t *activator)
void void
SP_misc_flare(edict_t* ent) SP_misc_flare(edict_t* ent)
{ {
int i;
ent->s.modelindex = 0; ent->s.modelindex = 0;
ent->s.renderfx = RF_FLARE; ent->s.renderfx = RF_FLARE;
ent->solid = SOLID_NOT; ent->solid = SOLID_NOT;
/*
* TODO: Add scale field /* Radius saved to scale */
* ent->s.scale = st.radius; for (i = 0; i < 3; i++)
*/ {
ent->s.scale[i] = st.radius;
}
if (ent->spawnflags & SPAWNFLAG_FLARE_RED) if (ent->spawnflags & SPAWNFLAG_FLARE_RED)
{ {
@ -3336,6 +3340,7 @@ SP_misc_flare(edict_t* ent)
ent->s.modelindex2 = st.fade_start_dist; ent->s.modelindex2 = st.fade_start_dist;
ent->s.modelindex3 = st.fade_end_dist; ent->s.modelindex3 = st.fade_end_dist;
ent->s.skinnum = st.rgba;
if (ent->targetname) if (ent->targetname)
{ {

6
src/game/g_obj.c
View file

@ -79,6 +79,12 @@ object_big_fire_think(edict_t *self)
{ {
self->s.frame = (self->s.frame + 1) % 60; self->s.frame = (self->s.frame + 1) % 60;
self->nextthink = level.time + FRAMETIME; self->nextthink = level.time + FRAMETIME;
/* add particles */
gi.WriteByte(svc_temp_entity);
gi.WriteByte(TE_FLAME);
gi.WritePosition(self->s.origin);
gi.multicast(self->s.origin, MULTICAST_PVS);
} }
void void

121
src/game/g_spawn.c
View file

@ -72,6 +72,7 @@ typedef struct
static dynamicentity_t *dynamicentities; static dynamicentity_t *dynamicentities;
static int ndynamicentities; static int ndynamicentities;
static int nstaticentities;
static void static void
DynamicSpawnUpdate(edict_t *self, dynamicentity_t *data) DynamicSpawnUpdate(edict_t *self, dynamicentity_t *data)
@ -116,11 +117,27 @@ DynamicSpawnUpdate(edict_t *self, dynamicentity_t *data)
VectorCopy(data->mins, self->mins); VectorCopy(data->mins, self->mins);
VectorCopy(data->maxs, self->maxs); VectorCopy(data->maxs, self->maxs);
self->monsterinfo.scale = ( /* has updated scale */
data->scale[0] + if (st.scale[0] || st.scale[1] || st.scale[2])
data->scale[1] + {
data->scale[2] /* copy to other parts if zero */
) / 3; if (!st.scale[1])
{
st.scale[1] = st.scale[0];
}
if (!st.scale[2])
{
st.scale[2] = st.scale[0];
}
/* Copy to entity scale field */
VectorCopy(st.scale, self->s.scale);
}
else
{
VectorCopy(data->scale, self->s.scale);
}
} }
void void
@ -220,6 +237,39 @@ Spawn_CheckCoop_MapHacks(edict_t *ent)
return false; return false;
} }
static const spawn_t *
StaticSpawnSearch(const char *classname)
{
int start, end;
start = 0;
end = nstaticentities - 1;
while (start <= end)
{
int i, res;
i = start + (end - start) / 2;
res = Q_stricmp(spawns[i].name, classname);
if (res == 0)
{
return &spawns[i];
}
else if (res < 0)
{
start = i + 1;
}
else
{
end = i - 1;
}
}
return NULL;
}
/* /*
* Finds the spawn function for * Finds the spawn function for
* the entity and calls it * the entity and calls it
@ -227,7 +277,7 @@ Spawn_CheckCoop_MapHacks(edict_t *ent)
void void
ED_CallSpawn(edict_t *ent) ED_CallSpawn(edict_t *ent)
{ {
spawn_t *s; const spawn_t *s;
gitem_t *item; gitem_t *item;
int i, dyn_id; int i, dyn_id;
@ -291,14 +341,12 @@ ED_CallSpawn(edict_t *ent)
} }
/* check normal spawn functions */ /* check normal spawn functions */
for (s = spawns; s->name; s++) s = StaticSpawnSearch(ent->classname);
if (s)
{ {
if (!strcmp(s->name, ent->classname)) /* found it */
{ s->spawn(ent);
/* found it */ return;
s->spawn(ent);
return;
}
} }
if (dyn_id >= 0 && dynamicentities[dyn_id].model_path[0]) if (dyn_id >= 0 && dynamicentities[dyn_id].model_path[0])
@ -478,6 +526,7 @@ ED_ParseField(const char *key, const char *value, edict_t *ent)
*(char **)(b + f->ofs) = ED_NewString(value, false); *(char **)(b + f->ofs) = ED_NewString(value, false);
break; break;
case F_VECTOR: case F_VECTOR:
VectorClear(vec);
sscanf(value, "%f %f %f", &vec[0], &vec[1], &vec[2]); sscanf(value, "%f %f %f", &vec[0], &vec[1], &vec[2]);
((float *)(b + f->ofs))[0] = vec[0]; ((float *)(b + f->ofs))[0] = vec[0];
((float *)(b + f->ofs))[1] = vec[1]; ((float *)(b + f->ofs))[1] = vec[1];
@ -1940,7 +1989,7 @@ DynamicSort(const void *p1, const void *p2)
return Q_stricmp(ent1->classname, ent2->classname); return Q_stricmp(ent1->classname, ent2->classname);
} }
void static void
DynamicSpawnInit(void) DynamicSpawnInit(void)
{ {
char *buf_ent, *buf_ai, *raw; char *buf_ent, *buf_ai, *raw;
@ -2132,6 +2181,11 @@ DynamicSpawnInit(void)
* max attenuation * max attenuation
*/ */
/* Fix path */
Q_replacebackslash(dynamicentities[curr_pos].model_path);
/* go to next row */
curr_pos ++; curr_pos ++;
} }
@ -2199,6 +2253,10 @@ DynamicSpawnInit(void)
/* Additional field for cover for color from QUAKED */ /* Additional field for cover for color from QUAKED */
line = DynamicFloatParse(line, dynamicentities[curr_pos].color, 3, '|'); line = DynamicFloatParse(line, dynamicentities[curr_pos].color, 3, '|');
/* Fix path */
Q_replacebackslash(dynamicentities[curr_pos].model_path);
/* go to next row */
curr_pos ++; curr_pos ++;
} }
curr += linesize; curr += linesize;
@ -2226,3 +2284,38 @@ DynamicSpawnInit(void)
/* sort definitions */ /* sort definitions */
qsort(dynamicentities, ndynamicentities, sizeof(dynamicentity_t), DynamicSort); qsort(dynamicentities, ndynamicentities, sizeof(dynamicentity_t), DynamicSort);
} }
static int
StaticSort(const void *p1, const void *p2)
{
spawn_t *ent1, *ent2;
ent1 = (spawn_t*)p1;
ent2 = (spawn_t*)p2;
return Q_stricmp(ent1->name, ent2->name);
}
static void
StaticSpawnInit(void)
{
const spawn_t *s;
/* check count of spawn functions */
for (s = spawns; s->name; s++)
{
}
nstaticentities = s - spawns;
gi.dprintf("Found %d static definitions\n", nstaticentities);
/* sort definitions */
qsort(spawns, nstaticentities, sizeof(spawn_t), StaticSort);
}
void
SpawnInit(void)
{
StaticSpawnInit();
DynamicSpawnInit();
}

11
src/game/g_target.c
View file

@ -672,7 +672,7 @@ SP_target_spawner(edict_t *self)
if (!Q_stricmp(level.mapname, "fact2") if (!Q_stricmp(level.mapname, "fact2")
&& VectorCompare(self->s.origin, fact2spawnpoint1) ) && VectorCompare(self->s.origin, fact2spawnpoint1) )
{ {
VectorSet (forward, 0, 0, 1); VectorSet(forward, 0, 0, 1);
VectorMA (self->s.origin, -8, forward, self->s.origin); VectorMA (self->s.origin, -8, forward, self->s.origin);
} }
@ -1888,6 +1888,15 @@ SP_target_music(edict_t* self)
self->use = target_music_use; self->use = target_music_use;
} }
/*
* QUAKED target_sky (1 0 0) (-8 -8 -8) (8 8 8)
*
* Change sky parameters
* - sky: Environment map name
* - skyaxis: Vector axis for rotating sky
* - skyrotate: Speed of rotation (degrees/second)
* - skyautorotate: Disable to set sky rotation manually
*/
void void
target_sky_use(edict_t *self, edict_t *other, edict_t *activator) target_sky_use(edict_t *self, edict_t *other, edict_t *activator)
{ {

4
src/game/g_translate.c
View file

@ -53,12 +53,14 @@ LocalizationInit(void)
byte *raw = NULL; byte *raw = NULL;
char *buf_local = NULL, *buf_level = NULL; char *buf_local = NULL, *buf_level = NULL;
int len_local, len_level, curr_pos; int len_local, len_level, curr_pos;
char loc_name[MAX_QPATH];
localmessages = NULL; localmessages = NULL;
nlocalmessages = 0; nlocalmessages = 0;
snprintf(loc_name, sizeof(loc_name) - 1, "localization/loc_%s.txt", g_language->string);
/* load the localization file */ /* load the localization file */
len_local = gi.FS_LoadFile("localization/loc_english.txt", (void **)&raw); len_local = gi.FS_LoadFile(loc_name, (void **)&raw);
if (len_local > 1) if (len_local > 1)
{ {
buf_local = malloc(len_local + 1); buf_local = malloc(len_local + 1);

30
src/game/g_trigger.c
View file

@ -1124,3 +1124,33 @@ SP_trigger_monsterjump(edict_t *self)
self->touch = trigger_monsterjump_touch; self->touch = trigger_monsterjump_touch;
self->movedir[2] = st.height; self->movedir[2] = st.height;
} }
/*
* QUAKED choose_cdtrack (.5 .5 .5) ?
* Sets CD track
*
* style: CD Track Id
*/
void
choose_cdtrack_touch(edict_t *self, edict_t *other, cplane_t *plane /* unused */,
csurface_t *surf /* unused */)
{
if (!self)
{
return;
}
gi.configstring(CS_CDTRACK, va("%i", self->style));
}
void
SP_choose_cdtrack(edict_t *self)
{
if (!self)
{
return;
}
InitTrigger(self);
self->touch = choose_cdtrack_touch;
}

8
src/game/header/local.h
View file

@ -411,10 +411,15 @@ typedef struct
float minpitch; float minpitch;
float maxpitch; float maxpitch;
/* misc_flare */
float radius; float radius;
float fade_start_dist; float fade_start_dist;
float fade_end_dist; float fade_end_dist;
char *image; char *image;
unsigned rgba;
/* Addional fields for models */
vec3_t scale;
} spawn_temp_t; } spawn_temp_t;
typedef struct typedef struct
@ -679,6 +684,7 @@ extern cvar_t *aimfix;
extern cvar_t *g_machinegun_norecoil; extern cvar_t *g_machinegun_norecoil;
extern cvar_t *g_quick_weap; extern cvar_t *g_quick_weap;
extern cvar_t *g_swap_speed; extern cvar_t *g_swap_speed;
extern cvar_t *g_language;
/* this is for the count of monsters */ /* this is for the count of monsters */
#define ENT_SLOTS_LEFT \ #define ENT_SLOTS_LEFT \
@ -1084,7 +1090,7 @@ void fire_doppleganger(edict_t *ent, vec3_t start, vec3_t aimdir);
/* g_spawn.c */ /* g_spawn.c */
void ED_CallSpawn(edict_t *ent); void ED_CallSpawn(edict_t *ent);
char *ED_NewString(const char *string, qboolean raw); char *ED_NewString(const char *string, qboolean raw);
void DynamicSpawnInit(void); void SpawnInit(void);
edict_t *CreateFlyMonster(vec3_t origin, vec3_t angles, vec3_t mins, edict_t *CreateFlyMonster(vec3_t origin, vec3_t angles, vec3_t mins,
vec3_t maxs, char *classname); vec3_t maxs, char *classname);
edict_t *CreateGroundMonster(vec3_t origin, vec3_t angles, vec3_t mins, edict_t *CreateGroundMonster(vec3_t origin, vec3_t angles, vec3_t mins,

24
src/game/monster/actor/actor.c
View file

@ -314,7 +314,7 @@ void actorMachineGun (edict_t *self)
vec3_t start, target; vec3_t start, target;
vec3_t forward, right; vec3_t forward, right;
AngleVectors (self->s.angles, forward, right, NULL); AngleVectors(self->s.angles, forward, right, NULL);
G_ProjectSource (self->s.origin, monster_flash_offset[MZ2_ACTOR_MACHINEGUN_1], forward, right, start); G_ProjectSource (self->s.origin, monster_flash_offset[MZ2_ACTOR_MACHINEGUN_1], forward, right, start);
if (self->enemy) if (self->enemy)
{ {
@ -325,7 +325,7 @@ void actorMachineGun (edict_t *self)
} }
else else
{ {
VectorCopy (self->enemy->absmin, target); VectorCopy(self->enemy->absmin, target);
target[2] += (self->enemy->size[2] / 2); target[2] += (self->enemy->size[2] / 2);
} }
VectorSubtract (target, start, forward); VectorSubtract (target, start, forward);
@ -333,7 +333,7 @@ void actorMachineGun (edict_t *self)
} }
else else
{ {
AngleVectors (self->s.angles, forward, NULL, NULL); AngleVectors(self->s.angles, forward, NULL, NULL);
} }
monster_fire_bullet (self, start, forward, 3, 4, DEFAULT_BULLET_HSPREAD, DEFAULT_BULLET_VSPREAD, MZ2_ACTOR_MACHINEGUN_1); monster_fire_bullet (self, start, forward, 3, 4, DEFAULT_BULLET_HSPREAD, DEFAULT_BULLET_VSPREAD, MZ2_ACTOR_MACHINEGUN_1);
} }
@ -341,12 +341,12 @@ void actorMachineGun (edict_t *self)
void actor_dead (edict_t *self) void actor_dead (edict_t *self)
{ {
VectorSet (self->mins, -16, -16, -24); VectorSet(self->mins, -16, -16, -24);
VectorSet (self->maxs, 16, 16, -8); VectorSet(self->maxs, 16, 16, -8);
self->movetype = MOVETYPE_TOSS; self->movetype = MOVETYPE_TOSS;
self->svflags |= SVF_DEADMONSTER; self->svflags |= SVF_DEADMONSTER;
self->nextthink = 0; self->nextthink = 0;
gi.linkentity (self); gi.linkentity(self);
} }
static mframe_t actor_frames_death1 [] = static mframe_t actor_frames_death1 [] =
@ -506,8 +506,8 @@ void SP_misc_actor (edict_t *self)
self->movetype = MOVETYPE_STEP; self->movetype = MOVETYPE_STEP;
self->solid = SOLID_BBOX; self->solid = SOLID_BBOX;
self->s.modelindex = gi.modelindex("players/male/tris.md2"); self->s.modelindex = gi.modelindex("players/male/tris.md2");
VectorSet (self->mins, -16, -16, -24); VectorSet(self->mins, -16, -16, -24);
VectorSet (self->maxs, 16, 16, 32); VectorSet(self->maxs, 16, 16, 32);
if (!self->health) if (!self->health)
self->health = 100; self->health = 100;
@ -525,7 +525,7 @@ void SP_misc_actor (edict_t *self)
self->monsterinfo.aiflags |= AI_GOOD_GUY; self->monsterinfo.aiflags |= AI_GOOD_GUY;
gi.linkentity (self); gi.linkentity(self);
self->monsterinfo.currentmove = &actor_move_stand; self->monsterinfo.currentmove = &actor_move_stand;
self->monsterinfo.scale = MODEL_SCALE; self->monsterinfo.scale = MODEL_SCALE;
@ -651,8 +651,8 @@ void SP_target_actor (edict_t *self)
self->solid = SOLID_TRIGGER; self->solid = SOLID_TRIGGER;
self->touch = target_actor_touch; self->touch = target_actor_touch;
VectorSet (self->mins, -8, -8, -8); VectorSet(self->mins, -8, -8, -8);
VectorSet (self->maxs, 8, 8, 8); VectorSet(self->maxs, 8, 8, 8);
self->svflags = SVF_NOCLIENT; self->svflags = SVF_NOCLIENT;
if (self->spawnflags & 1) if (self->spawnflags & 1)
@ -667,5 +667,5 @@ void SP_target_actor (edict_t *self)
self->movedir[2] = st.height; self->movedir[2] = st.height;
} }
gi.linkentity (self); gi.linkentity(self);
} }

4
src/game/monster/boss3/boss32.c
View file

@ -871,7 +871,7 @@ makron_torso_origin(edict_t *self, edict_t *torso)
tr = gi.trace(self->s.origin, torso->mins, torso->maxs, v, self, MASK_SOLID); tr = gi.trace(self->s.origin, torso->mins, torso->maxs, v, self, MASK_SOLID);
VectorCopy (tr.endpos, torso->s.origin); VectorCopy(tr.endpos, torso->s.origin);
} }
void void
@ -1007,7 +1007,7 @@ makron_die(edict_t *self, edict_t *inflictor /* unused */, edict_t *attacker /*
/* lower bbox since the torso is gone */ /* lower bbox since the torso is gone */
self->maxs[2] = 64; self->maxs[2] = 64;
gi.linkentity (self); gi.linkentity(self);
self->monsterinfo.currentmove = &makron_move_death2; self->monsterinfo.currentmove = &makron_move_death2;
} }

2
src/game/monster/dog/dog.c
View file

@ -122,7 +122,7 @@ dog_leap_step(edict_t *self)
{ {
vec3_t forward; vec3_t forward;
AngleVectors (self->s.angles, forward, NULL, NULL); AngleVectors(self->s.angles, forward, NULL, NULL);
self->s.origin[2] += 1; self->s.origin[2] += 1;
VectorScale(forward, 300, self->velocity); VectorScale(forward, 300, self->velocity);
self->velocity[2] = 200; self->velocity[2] = 200;

2
src/game/monster/shalrath/shalrath.c
View file

@ -191,7 +191,7 @@ FireShalrathPod(edict_t *self)
vec3_t vec; vec3_t vec;
vec3_t offset = {16, 0, 16}; vec3_t offset = {16, 0, 16};
AngleVectors (self->s.angles, forward, right, NULL); AngleVectors(self->s.angles, forward, right, NULL);
G_ProjectSource(self->s.origin, offset, forward, right, start); G_ProjectSource(self->s.origin, offset, forward, right, start);
VectorCopy(self->enemy->s.origin, vec); VectorCopy(self->enemy->s.origin, vec);
vec[2] += self->enemy->viewheight; vec[2] += self->enemy->viewheight;

4
src/game/monster/shambler/shambler.c
View file

@ -710,8 +710,8 @@ SP_monster_shambler(edict_t* self)
} }
self->s.modelindex = gi.modelindex("models/monsters/shambler/tris.md2"); self->s.modelindex = gi.modelindex("models/monsters/shambler/tris.md2");
VectorSet (self->mins, -32, -32, -24); VectorSet(self->mins, -32, -32, -24);
VectorSet (self->maxs, 32, 32, 64); VectorSet(self->maxs, 32, 32, 64);
self->movetype = MOVETYPE_STEP; self->movetype = MOVETYPE_STEP;
self->solid = SOLID_BBOX; self->solid = SOLID_BBOX;

4
src/game/monster/tank/tank.c
View file

@ -539,11 +539,11 @@ TankRocket(edict_t *self)
if (blindfire) if (blindfire)
{ {
VectorCopy (self->monsterinfo.blind_fire_target, target); VectorCopy(self->monsterinfo.blind_fire_target, target);
} }
else else
{ {
VectorCopy (self->enemy->s.origin, target); VectorCopy(self->enemy->s.origin, target);
} }
if (blindfire) if (blindfire)

2
src/game/monster/tarbaby/tarbaby.c
View file

@ -145,7 +145,7 @@ tarbaby_jump_step(edict_t *self)
self->movetype = MOVETYPE_BOUNCE; self->movetype = MOVETYPE_BOUNCE;
self->touch = tarbaby_touch; self->touch = tarbaby_touch;
AngleVectors (self->s.angles, forward, NULL, NULL); AngleVectors(self->s.angles, forward, NULL, NULL);
self->s.origin[2] += 1; self->s.origin[2] += 1;
VectorScale(forward, 600, self->velocity); VectorScale(forward, 600, self->velocity);
self->velocity[2] = 200 + (random() * 150); self->velocity[2] = 200 + (random() * 150);

2
src/game/monster/wizard/wizard.c
View file

@ -221,7 +221,7 @@ wizard_spit(edict_t *self)
vec3_t vec; vec3_t vec;
vec3_t offset = {0, 0, 30}; vec3_t offset = {0, 0, 30};
AngleVectors (self->s.angles, forward, right, NULL); AngleVectors(self->s.angles, forward, right, NULL);
G_ProjectSource(self->s.origin, offset, forward, right, start); G_ProjectSource(self->s.origin, offset, forward, right, start);
VectorCopy(self->enemy->s.origin, vec); VectorCopy(self->enemy->s.origin, vec);
vec[2] += self->enemy->viewheight; vec[2] += self->enemy->viewheight;

2
src/game/player/chase.c
View file

@ -321,7 +321,7 @@ CheckChasecam_Viewent(edict_t *ent)
ent->client->oldplayer->flags = ent->flags; ent->client->oldplayer->flags = ent->flags;
/* end Lazarus */ /* end Lazarus */
gi.linkentity (ent->client->oldplayer); gi.linkentity(ent->client->oldplayer);
} }
} }

6
src/game/player/client.c
View file

@ -2265,8 +2265,8 @@ PutClientInServer(edict_t *ent)
/* clear entity state values */ /* clear entity state values */
ent->s.effects = 0; ent->s.effects = 0;
ent->s.skinnum = ent - g_edicts - 1; ent->s.skinnum = ent - g_edicts - 1;
ent->s.modelindex = 255; /* will use the skin specified model */ ent->s.modelindex = CUSTOM_PLAYER_MODEL; /* will use the skin specified model */
ent->s.modelindex2 = 255; /* custom gun model */ ent->s.modelindex2 = CUSTOM_PLAYER_MODEL; /* custom gun model */
/* sknum is player num and weapon number /* sknum is player num and weapon number
weapon number will be added in changeweapon */ weapon number will be added in changeweapon */
@ -2840,7 +2840,7 @@ ClientThink(edict_t *ent, usercmd_t *ucmd)
{ {
client->ps.pmove.pm_type = PM_SPECTATOR; client->ps.pmove.pm_type = PM_SPECTATOR;
} }
else if (ent->s.modelindex != 255) else if (ent->s.modelindex != CUSTOM_PLAYER_MODEL)
{ {
client->ps.pmove.pm_type = PM_GIB; client->ps.pmove.pm_type = PM_GIB;
} }

8
src/game/player/view.c
View file

@ -116,7 +116,7 @@ P_DamageFeedback(edict_t *player)
} }
/* start a pain animation if still in the player model */ /* start a pain animation if still in the player model */
if ((client->anim_priority < ANIM_PAIN) && (player->s.modelindex == 255)) if ((client->anim_priority < ANIM_PAIN) && (player->s.modelindex == CUSTOM_PLAYER_MODEL))
{ {
static int i; static int i;
@ -432,7 +432,7 @@ SV_CalcViewOffset(edict_t *ent)
} }
else else
{ {
VectorSet (v, 0, 0, 0); VectorSet(v, 0, 0, 0);
if (ent->client->chasecam) if (ent->client->chasecam)
{ {
ent->client->ps.pmove.origin[0] = ent->client->chasecam->s.origin[0] * 8; ent->client->ps.pmove.origin[0] = ent->client->chasecam->s.origin[0] * 8;
@ -782,7 +782,7 @@ P_FallingDamage(edict_t *ent)
return; return;
} }
if (ent->s.modelindex != 255) if (ent->s.modelindex != CUSTOM_PLAYER_MODEL)
{ {
return; /* not in the player model */ return; /* not in the player model */
} }
@ -1333,7 +1333,7 @@ G_SetClientFrame(edict_t *ent)
return; return;
} }
if (ent->s.modelindex != 255) if (ent->s.modelindex != CUSTOM_PLAYER_MODEL)
{ {
return; /* not in the player model */ return; /* not in the player model */
} }

10
src/game/player/weapon.c
View file

@ -210,8 +210,8 @@ PlayerNoise_Spawn(edict_t *who, int type)
noise->classname = "player_noise"; noise->classname = "player_noise";
noise->spawnflags = type; noise->spawnflags = type;
VectorSet (noise->mins, -8, -8, -8); VectorSet(noise->mins, -8, -8, -8);
VectorSet (noise->maxs, 8, 8, 8); VectorSet(noise->maxs, 8, 8, 8);
noise->owner = who; noise->owner = who;
noise->svflags = SVF_NOCLIENT; noise->svflags = SVF_NOCLIENT;
@ -477,7 +477,7 @@ ChangeWeapon(edict_t *ent)
ent->client->machinegun_shots = 0; ent->client->machinegun_shots = 0;
/* set visible model */ /* set visible model */
if (ent->s.modelindex == 255) if (ent->s.modelindex == CUSTOM_PLAYER_MODEL)
{ {
if (ent->client->pers.weapon) if (ent->client->pers.weapon)
{ {
@ -847,7 +847,7 @@ Weapon_Generic2(edict_t *ent, int FRAME_ACTIVATE_LAST, int FRAME_FIRE_LAST,
return; return;
} }
if (ent->deadflag || (ent->s.modelindex != 255)) /* VWep animations screw up corpses */ if (ent->deadflag || (ent->s.modelindex != CUSTOM_PLAYER_MODEL)) /* VWep animations screw up corpses */
{ {
return; return;
} }
@ -1125,7 +1125,7 @@ weapon_grenade_fire(edict_t *ent, qboolean held)
ent->client->grenade_time = level.time + 1.0; ent->client->grenade_time = level.time + 1.0;
if (ent->deadflag || (ent->s.modelindex != 255)) /* VWep animations screw up corpses */ if (ent->deadflag || (ent->s.modelindex != CUSTOM_PLAYER_MODEL)) /* VWep animations screw up corpses */
{ {
return; return;
} }

3
src/game/savegame/savegame.c
View file

@ -263,12 +263,13 @@ InitGame(void)
g_machinegun_norecoil = gi.cvar("g_machinegun_norecoil", "0", CVAR_ARCHIVE); g_machinegun_norecoil = gi.cvar("g_machinegun_norecoil", "0", CVAR_ARCHIVE);
g_quick_weap = gi.cvar("g_quick_weap", "1", CVAR_ARCHIVE); g_quick_weap = gi.cvar("g_quick_weap", "1", CVAR_ARCHIVE);
g_swap_speed = gi.cvar("g_swap_speed", "1", CVAR_ARCHIVE); g_swap_speed = gi.cvar("g_swap_speed", "1", CVAR_ARCHIVE);
g_language = gi.cvar("g_language", "english", CVAR_ARCHIVE);
/* initilize localization */ /* initilize localization */
LocalizationInit(); LocalizationInit();
/* initilize dynamic object spawn */ /* initilize dynamic object spawn */
DynamicSpawnInit(); SpawnInit();
/* items */ /* items */
InitItems(); InitItems();

4
src/game/savegame/tables/fields.h
View file

@ -58,7 +58,9 @@
{"origin", FOFS(s.origin), F_VECTOR}, {"origin", FOFS(s.origin), F_VECTOR},
{"angles", FOFS(s.angles), F_VECTOR}, {"angles", FOFS(s.angles), F_VECTOR},
{"angle", FOFS(s.angles), F_ANGLEHACK}, {"angle", FOFS(s.angles), F_ANGLEHACK},
{"rgba", FOFS(s.skinnum), F_RGBA}, {"rgb", STOFS(rgba), F_RGBA, FFL_SPAWNTEMP},
{"rgba", STOFS(rgba), F_RGBA, FFL_SPAWNTEMP},
{"scale", STOFS(scale), F_VECTOR, FFL_SPAWNTEMP},
{"radius", STOFS(radius), F_FLOAT, FFL_SPAWNTEMP}, {"radius", STOFS(radius), F_FLOAT, FFL_SPAWNTEMP},
{"fade_start_dist", STOFS(fade_start_dist), F_FLOAT, FFL_SPAWNTEMP}, {"fade_start_dist", STOFS(fade_start_dist), F_FLOAT, FFL_SPAWNTEMP},
{"fade_end_dist", STOFS(fade_end_dist), F_FLOAT, FFL_SPAWNTEMP}, {"fade_end_dist", STOFS(fade_end_dist), F_FLOAT, FFL_SPAWNTEMP},

3
src/game/savegame/tables/gamefunc_decs.h
View file

@ -560,6 +560,7 @@ extern void chick_sight ( edict_t * self , edict_t * other ) ;
extern void chick_slash ( edict_t * self ) ; extern void chick_slash ( edict_t * self ) ;
extern void chick_stand ( edict_t * self ) ; extern void chick_stand ( edict_t * self ) ;
extern void chick_walk ( edict_t * self ) ; extern void chick_walk ( edict_t * self ) ;
extern void choose_cdtrack_touch ( edict_t * ent , edict_t * other , cplane_t * plane , csurface_t * surf ) ;
extern void cleanupHeal ( edict_t * ent, qboolean change_frame ) ; extern void cleanupHeal ( edict_t * ent, qboolean change_frame ) ;
extern void cleanupHealTarget ( edict_t * ent ) ; extern void cleanupHealTarget ( edict_t * ent ) ;
extern void commander_body_die ( edict_t * self , edict_t * inflictor , edict_t * attacker , int damage , vec3_t point ) ; extern void commander_body_die ( edict_t * self , edict_t * inflictor , edict_t * attacker , int damage , vec3_t point ) ;
@ -617,7 +618,7 @@ extern void drawbbox ( edict_t * self ) ;
extern void drop_make_touchable ( edict_t * ent ) ; extern void drop_make_touchable ( edict_t * ent ) ;
extern void drop_temp_touch ( edict_t * ent , edict_t * other , cplane_t * plane , csurface_t * surf ) ; extern void drop_temp_touch ( edict_t * ent , edict_t * other , cplane_t * plane , csurface_t * surf ) ;
extern void droptofloor ( edict_t * ent ) ; extern void droptofloor ( edict_t * ent ) ;
extern void dynamicspawn_touch(edict_t *self, edict_t *other, cplane_t *plane /* unused */, csurface_t *surf /* unused */); extern void dynamicspawn_touch ( edict_t * ent , edict_t * other , cplane_t * plane , csurface_t * surf ) ;
extern void enfbolt_touch ( edict_t * self , edict_t * other , cplane_t * plane, csurface_t *surf); extern void enfbolt_touch ( edict_t * self , edict_t * other , cplane_t * plane, csurface_t *surf);
extern void enforcer_attack ( edict_t * self ) ; extern void enforcer_attack ( edict_t * self ) ;
extern void enforcer_die ( edict_t * self , edict_t * inflictor , edict_t * attacker , int damage , vec3_t point ) ; extern void enforcer_die ( edict_t * self , edict_t * inflictor , edict_t * attacker , int damage , vec3_t point ) ;

1
src/game/savegame/tables/gamefunc_list.h
View file

@ -522,6 +522,7 @@
{"chick_slash", (byte *)chick_slash}, {"chick_slash", (byte *)chick_slash},
{"chick_stand", (byte *)chick_stand}, {"chick_stand", (byte *)chick_stand},
{"chick_walk", (byte *)chick_walk}, {"chick_walk", (byte *)chick_walk},
{"choose_cdtrack_touch", (byte *)choose_cdtrack_touch},
{"cleanupHeal", (byte *)cleanupHeal}, {"cleanupHeal", (byte *)cleanupHeal},
{"cleanupHealTarget", (byte *)cleanupHealTarget}, {"cleanupHealTarget", (byte *)cleanupHealTarget},
{"commander_body_die", (byte *)commander_body_die}, {"commander_body_die", (byte *)commander_body_die},

1
src/game/savegame/tables/spawnfunc_decs.h
View file

@ -29,6 +29,7 @@
extern void SP_CreateCoopSpots(edict_t * self); extern void SP_CreateCoopSpots(edict_t * self);
extern void SP_CreateUnnamedSpawn(edict_t * self); extern void SP_CreateUnnamedSpawn(edict_t * self);
extern void SP_FixCoopSpots(edict_t * self); extern void SP_FixCoopSpots(edict_t * self);
extern void SP_choose_cdtrack(edict_t *self);
extern void SP_dm_dball_ball(edict_t * self); extern void SP_dm_dball_ball(edict_t * self);
extern void SP_dm_dball_ball_start(edict_t * self); extern void SP_dm_dball_ball_start(edict_t * self);
extern void SP_dm_dball_goal(edict_t * self); extern void SP_dm_dball_goal(edict_t * self);

1
src/game/savegame/tables/spawnfunc_list.h
View file

@ -28,6 +28,7 @@
{"ammo_magslug", SP_xatrix_item}, {"ammo_magslug", SP_xatrix_item},
{"ammo_trap", SP_xatrix_item}, {"ammo_trap", SP_xatrix_item},
{"choose_cdtrack", SP_choose_cdtrack},
{"dm_dball_ball", SP_dm_dball_ball}, {"dm_dball_ball", SP_dm_dball_ball},
{"dm_dball_ball_start", SP_dm_dball_ball_start}, {"dm_dball_ball_start", SP_dm_dball_ball_start},
{"dm_dball_goal", SP_dm_dball_goal}, {"dm_dball_goal", SP_dm_dball_goal},

4
stuff/models/entity.dat
View file

@ -600,7 +600,7 @@ character_siernan2|models/monsters/siernan/laying/tris.fm|1.0|1.0|1.0|general|-1
character_ssithra_scout|models/monsters/ssithra/scout_scene/tris.fm|1.0|1.0|1.0|general|-26.0|-16.0|-13.0|26.0|16.0|13.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Ssithra scout|0.3|0.3|1.0 character_ssithra_scout|models/monsters/ssithra/scout_scene/tris.fm|1.0|1.0|1.0|general|-26.0|-16.0|-13.0|26.0|16.0|13.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Ssithra scout|0.3|0.3|1.0
character_ssithra_victim|models/monsters/Ssithra/cinematics/tris.fm|1.0|1.0|1.0|general|-40.0|-16.0|-2.0|40.0|16.0|2.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Ssithra torture victim|0.3|0.3|1.0 character_ssithra_victim|models/monsters/Ssithra/cinematics/tris.fm|1.0|1.0|1.0|general|-40.0|-16.0|-2.0|40.0|16.0|2.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Ssithra torture victim|0.3|0.3|1.0
character_tome|models/spells/book/tris.fm|1.0|1.0|1.0|general|-4.0|-8.0|-12.0|4.0|8.0|12.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Tome of Power|0.3|0.3|1.0 character_tome|models/spells/book/tris.fm|1.0|1.0|1.0|general|-4.0|-8.0|-12.0|4.0|8.0|12.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Tome of Power|0.3|0.3|1.0
choose_CDTrack||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Sets CD track|.5|.5|.5 choose_cdtrack||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Sets CD track|.5|.5|.5
env_bubbler||1.0|1.0|1.0|general|-8.0|-8.0|-8.0|8.0|8.0|8.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Bubbler|0.3|0.3|1.0 env_bubbler||1.0|1.0|1.0|general|-8.0|-8.0|-8.0|8.0|8.0|8.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Bubbler|0.3|0.3|1.0
env_dust||1.0|1.0|1.0|general|-8.0|-8.0|-8.0|8.0|8.0|8.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Dust (triggered)|0.3|0.3|1.0 env_dust||1.0|1.0|1.0|general|-8.0|-8.0|-8.0|8.0|8.0|8.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Dust (triggered)|0.3|0.3|1.0
env_fire||1.0|1.0|1.0|general|-8.0|-8.0|-8.0|8.0|8.0|8.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Flame effect. Does not emit light|0.3|0.3|1.0 env_fire||1.0|1.0|1.0|general|-8.0|-8.0|-8.0|8.0|8.0|8.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Flame effect. Does not emit light|0.3|0.3|1.0
@ -887,12 +887,10 @@ trigger_endgame||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|
trigger_farclip||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Changes the console variable r_farclipdist.|0.5|0.5|0.5 trigger_farclip||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Changes the console variable r_farclipdist.|0.5|0.5|0.5
trigger_fogdensity||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Sets r_fog_density and fog color|.5|.5|.5 trigger_fogdensity||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Sets r_fog_density and fog color|.5|.5|.5
trigger_goto_buoy||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Send monster to buoy|.5|.5|.5 trigger_goto_buoy||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Send monster to buoy|.5|.5|.5
trigger_Gravity||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none||.5|.5|.5
trigger_lightning||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Triggers lightning bolt|0.5|0.5|0.5 trigger_lightning||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Triggers lightning bolt|0.5|0.5|0.5
trigger_mappercentage||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Map percentage|0.3|0.1|0.6 trigger_mappercentage||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Map percentage|0.3|0.1|0.6
trigger_mission_give||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Gives mission objectives|0.5|0.5|0.5 trigger_mission_give||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Gives mission objectives|0.5|0.5|0.5
trigger_mission_take||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Removes mission objectives|0.5|0.5|0.5 trigger_mission_take||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Removes mission objectives|0.5|0.5|0.5
trigger_MonsterJump||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Makes monsters jump|0.5|0.5|0.5
trigger_playerpushbutton||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Player push button|.5|.5|.5 trigger_playerpushbutton||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Player push button|.5|.5|.5
trigger_playerpushlever||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Player Push lever|.5|.5|.5 trigger_playerpushlever||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Player Push lever|.5|.5|.5
trigger_playerusepuzzle||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Player can use puzzle items within this entity|.5|.5|.5 trigger_playerusepuzzle||1.0|1.0|1.0|general|0.0|0.0|0.0|0.0|0.0|0.0|shadow|0|0.0|0.0|0|0|0|0:0|0|0|none|Player can use puzzle items within this entity|.5|.5|.5