mirror of
https://github.com/nzp-team/quakespasm.git
synced 2025-02-16 08:31:29 +00:00
Fix preloads
This commit is contained in:
parent
2ec1cc2936
commit
63a1511630
5 changed files with 23 additions and 22 deletions
5
.github/workflows/build-and-release.yml
vendored
5
.github/workflows/build-and-release.yml
vendored
|
@ -9,9 +9,10 @@ jobs:
|
|||
image: vitasdk/vitasdk:latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Install Packages
|
||||
- name: Install Packages and update VitaGL
|
||||
run: |
|
||||
apk add build-base zip git curl
|
||||
apk add bash build-base zip git curl
|
||||
vdpm vitagl
|
||||
- name: Build
|
||||
working-directory: ./
|
||||
run: |
|
||||
|
|
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -5,4 +5,5 @@ build/*
|
|||
*.velf
|
||||
*.nro
|
||||
*.nacl
|
||||
*.sfo
|
||||
*.sfo
|
||||
*.bin
|
Binary file not shown.
|
@ -827,25 +827,24 @@ void Preload (void)
|
|||
{
|
||||
Mod_ForName ("models/player.mdl", true);
|
||||
|
||||
Mod_ForName ("models/ai/zbod.mdl",true);
|
||||
Mod_ForName ("models/ai/zlarm.mdl",true);
|
||||
Mod_ForName ("models/ai/zrarm.mdl",true);
|
||||
Mod_ForName ("models/ai/zhead.mdl",true);
|
||||
Mod_ForName ("models/ai/zcbod.mdl",true);
|
||||
Mod_ForName ("models/ai/zclarm.mdl",true);
|
||||
Mod_ForName ("models/ai/zcrarm.mdl",true);
|
||||
Mod_ForName ("models/ai/zchead.mdl",true);
|
||||
|
||||
Mod_ForName("models/ai/zbod.mdl", true);
|
||||
Mod_ForName("models/ai/zcbod.mdl", true);
|
||||
Mod_ForName ("models/ai/zfull.mdl",true);
|
||||
Mod_ForName ("models/ai/zcfull.mdl",true);
|
||||
Mod_ForName ("models/ai/zhead.mdl",true);
|
||||
Mod_ForName ("models/ai/zchead.mdl",true);
|
||||
Mod_ForName ("models/ai/zlarm.mdl",true);
|
||||
Mod_ForName ("models/ai/zclarm.mdl",true);
|
||||
Mod_ForName ("models/ai/zrarm.mdl",true);
|
||||
Mod_ForName ("models/ai/zcrarm.mdl",true);
|
||||
|
||||
Mod_ForName ("models/VModels/v_knife.mdl", true);
|
||||
Mod_ForName ("models/VModels/v_colt.mdl", true);
|
||||
Mod_ForName ("models/Misc/instakill!.mdl", true);
|
||||
Mod_ForName ("models/Misc/maxammo!.mdl", true);
|
||||
Mod_ForName ("models/Misc/nuke!.mdl", true);
|
||||
Mod_ForName ("models/Misc/carpenter!.mdl", true);
|
||||
Mod_ForName ("models/Misc/x2!.mdl", true);
|
||||
Mod_ForName ("models/weapons/knife/v_knife.mdl", true);
|
||||
Mod_ForName ("models/weapons/m1911/v_colt.mdl", true);
|
||||
Mod_ForName ("models/pu/instakill!.mdl", true);
|
||||
Mod_ForName ("models/pu/maxammo!.mdl", true);
|
||||
Mod_ForName ("models/pu/nuke!.mdl", true);
|
||||
Mod_ForName ("models/pu/carpenter!.mdl", true);
|
||||
Mod_ForName ("models/pu/x2!.mdl", true);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -441,7 +441,7 @@ Writes out the triangle indices needed to draw s as a triangle list.
|
|||
The number of indices it will write is given by R_NumTriangleIndicesForSurf.
|
||||
================
|
||||
*/
|
||||
static void R_TriangleIndicesForSurf (msurface_t *s, unsigned int *dest)
|
||||
static void R_TriangleIndicesForSurf (msurface_t *s, unsigned short *dest)
|
||||
{
|
||||
int i;
|
||||
for (i=2; i<s->numedges; i++)
|
||||
|
@ -454,7 +454,7 @@ static void R_TriangleIndicesForSurf (msurface_t *s, unsigned int *dest)
|
|||
|
||||
#define MAX_BATCH_SIZE 4096
|
||||
|
||||
static unsigned int vbo_indices[MAX_BATCH_SIZE];
|
||||
static unsigned short vbo_indices[MAX_BATCH_SIZE];
|
||||
static unsigned int num_vbo_indices;
|
||||
|
||||
/*
|
||||
|
@ -478,7 +478,7 @@ static void R_FlushBatch ()
|
|||
{
|
||||
if (num_vbo_indices > 0)
|
||||
{
|
||||
glDrawElements (GL_TRIANGLES, num_vbo_indices, GL_UNSIGNED_INT, vbo_indices);
|
||||
glDrawElements (GL_TRIANGLES, num_vbo_indices, GL_UNSIGNED_SHORT, vbo_indices);
|
||||
num_vbo_indices = 0;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue