nzp-team/quakespasm
0
0
Fork 0
mirror of https://github.com/nzp-team/quakespasm.git synced 2024-11-10 06:32:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/main'

Browse source
This commit is contained in:
Tyler Young 2022-12-22 17:22:53 -05:00
commit 990c6be72c
3 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/build-and-release.yml vendored
View file

@ -9,10 +9,14 @@ jobs:
image: vitasdk/vitasdk:latest
steps:
- uses: actions/checkout@v2
- name: Install Packages and update VitaGL
- name: Install Packages and build VitaGL
run: |
apk add bash build-base zip git curl cmake
vdpm vitagl
git clone https://github.com/Rinnegatamante/vitaGL.git
cd vitaGL
git checkout 4bdd4c26986bee48b7e98a27c7e6375b3ff84a86
make -j$(numproc) && make install
cd ../
git clone https://github.com/bythos14/SceShaccCgExt.git
cd SceShaccCgExt
mkdir build && cd build

26
source/gl_model.c
View file

@ -2448,11 +2448,29 @@ void Mod_FloodFillSkin( byte *skin, int skinwidth, int skinheight )
}
}
qboolean model_is_zombie(char name[MAX_QPATH])
{
if (Q_strcmp(name, "models/ai/zbod.mdl") == 0 ||
Q_strcmp(name, "models/ai/zcbod.mdl") == 0 ||
Q_strcmp(name, "models/ai/zcfull.mdl") == 0 ||
Q_strcmp(name, "models/ai/zchead.mdl") == 0 ||
Q_strcmp(name, "models/ai/zclarm.mdl") == 0 ||
Q_strcmp(name, "models/ai/zcrarm.mdl") == 0 ||
Q_strcmp(name, "models/ai/zfull.mdl") == 0 ||
Q_strcmp(name, "models/ai/zhead.mdl") == 0 ||
Q_strcmp(name, "models/ai/zlarm.mdl") == 0 ||
Q_strcmp(name, "models/ai/zrarm.mdl") == 0)
return true;
return false;
}
/*
===============
Mod_LoadAllSkins
===============
*/
extern const char* zombie_skinss[4];
void *Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype)
{
int i, j, k, size, groupskins;
@ -2493,7 +2511,13 @@ void *Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype)
int fwidth = 0, fheight = 0;
qboolean malloced=false;
enum srcformat fmt = SRC_RGBA;
q_snprintf (filename, sizeof(filename), "%s_%i", loadmodel->name, i);
if (model_is_zombie(loadmodel->name) == true) {
q_snprintf(filename, sizeof(filename), "%s", zombie_skinss[i]);
} else {
q_snprintf (filename, sizeof(filename), "%s_%i", loadmodel->name, i);
}
data = Image_LoadImage (filename, &fwidth, &fheight);
if (data) {

8
source/gl_rmisc.c
View file

@ -59,6 +59,8 @@ gltexture_t *decal_burn;
gltexture_t *decal_mark;
gltexture_t *decal_glow;
const char* zombie_skinss[4];
/*
====================
@ -676,5 +678,11 @@ void R_InitOtherTextures (void)
decal_burn = loadtextureimage ("textures/decals/explo_burn01");
decal_mark = loadtextureimage ("textures/decals/particle_burn01");
decal_glow = loadtextureimage ("textures/decals/glow2");
// external zombie skins
zombie_skinss[0] = "models/ai/zfull.mdl_0";
zombie_skinss[1] = "models/ai/zfull.mdl_1";
zombie_skinss[2] = "models/ai/zfull.mdl_2";
zombie_skinss[3] = "models/ai/zfull.mdl_3";
}