diff --git a/default.fmf b/default.fmf index d133b423..c7c4d410 100644 --- a/default.fmf +++ b/default.fmf @@ -2,7 +2,6 @@ FTEMANIFEST 1 GAME base NAME "Nuclide" BASEGAME platform -BASEGAME logos BASEGAME base // you don't really want to change these diff --git a/make_dist.sh b/make_dist.sh index 82ebd243..8152d4de 100755 --- a/make_dist.sh +++ b/make_dist.sh @@ -76,10 +76,7 @@ else cp "./platform/menu.dat" "./$BUILD_DIR/platform/menu.dat" rm "./$BUILD_DIR/platform/test_maps.pk3" - # spray logos - mkdir -p ./$BUILD_DIR/logos - cp ./logos/README ./$BUILD_DIR/logos/README - cp ./logos/fte.png ./$BUILD_DIR/logos/fte.png + # manifest cp ./default.fmf ./$BUILD_DIR/default.fmf sed -i "s|base|$GAME_DIR|g" ./$BUILD_DIR/default.fmf cp ./doc/release-readme ./$BUILD_DIR/README.txt diff --git a/logos/README b/platform/base_textures.pk3dir/logos/README similarity index 100% rename from logos/README rename to platform/base_textures.pk3dir/logos/README diff --git a/logos/fte.png b/platform/base_textures.pk3dir/logos/fte.png similarity index 100% rename from logos/fte.png rename to platform/base_textures.pk3dir/logos/fte.png diff --git a/src/gs-entbase/shared/baseentity.h b/src/gs-entbase/shared/baseentity.h index 708de17d..a061e31d 100644 --- a/src/gs-entbase/shared/baseentity.h +++ b/src/gs-entbase/shared/baseentity.h @@ -61,6 +61,7 @@ class CBaseEntity virtual void(void) Respawn; virtual void(void) Hide; virtual void(void) ParentUpdate; + virtual void(void) EvaluateEntity; virtual float(entity, float) SendEntity; virtual void(void) Pain; virtual void(void) Death; diff --git a/src/gs-entbase/shared/baseentity.qc b/src/gs-entbase/shared/baseentity.qc index 3821ccaf..67956c10 100644 --- a/src/gs-entbase/shared/baseentity.qc +++ b/src/gs-entbase/shared/baseentity.qc @@ -563,9 +563,8 @@ CBaseEntity::Death(void) } -/* Make sure StartFrame calls this */ void -CBaseEntity::ParentUpdate(void) +CBaseEntity::EvaluateEntity(void) { /* while the engine is still handling physics for these, we can't * predict when origin/angle might change */ @@ -585,6 +584,13 @@ CBaseEntity::ParentUpdate(void) net_velocity = velocity; SendFlags |= BASEFL_CHANGED_VELOCITY; } +} + +/* Make sure StartFrame calls this */ +void +CBaseEntity::ParentUpdate(void) +{ + EvaluateEntity(); frame1time += frametime; diff --git a/src/menu-fn/m_customize.qc b/src/menu-fn/m_customize.qc index 8e8e9137..5699858f 100644 --- a/src/menu-fn/m_customize.qc +++ b/src/menu-fn/m_customize.qc @@ -177,12 +177,15 @@ menu_customize_init(void) g_sprayscount = 0; /* scan and cache the sprays */ - searchhandle searchy = search_begin("*.*", SEARCH_NAMESORT, TRUE); + searchhandle searchy = search_begin("logos/*.*", SEARCH_NAMESORT, TRUE); for (int i = 0; i < search_getsize(searchy); i++) { string full = search_getfilename(searchy, i); string filename = substring(search_getfilename(searchy, i), 0, -5); string extension = substring(full, strlen(full) - 3, 3); - if (extension == "bmp" || extension == "png" || extension == "jpg") { + print(full); + print("\n"); + + /*if (extension == "bmp" || extension == "png" || extension == "jpg")*/ { g_sprayscount++; } } @@ -194,8 +197,10 @@ menu_customize_init(void) string full = search_getfilename(searchy, i); string filename = substring(full, 0, -5); string extension = substring(full, strlen(full) - 3, 3); + print(full); + print("\n"); - if (extension == "bmp" || extension == "png" || extension == "jpg") { + /*if (extension == "bmp" || extension == "png" || extension == "jpg")*/ { g_sprays[sid] = precache_pic(full); sid++; }