irx, nullptr, threading patch
This commit is contained in:
@@ -30,9 +30,9 @@ Enemy::Enemy(Engine* engine, const EnemyInfo& t_info) {
|
||||
info.bodyTexture->addLink(bodyMaterial->id);
|
||||
info.clothTexture->addLink(clothMaterial->id);
|
||||
|
||||
float r = Math::randomf(64.0F, 128.0F);
|
||||
float g = Math::randomf(64.0F, 128.0F);
|
||||
float b = Math::randomf(64.0F, 128.0F);
|
||||
float r = Math::randomf(75.0F, 128.0F);
|
||||
float g = Math::randomf(75.0F, 128.0F);
|
||||
float b = Math::randomf(75.0F, 128.0F);
|
||||
|
||||
bodyMaterial->ambient.set(r, g, b);
|
||||
clothMaterial->ambient.set(r, g, b);
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
|
||||
#include "states/game/enemy/enemy_manager.hpp"
|
||||
#include <functional>
|
||||
#include "game_settings.hpp"
|
||||
|
||||
using Tyra::FileUtils;
|
||||
using Tyra::Math;
|
||||
@@ -46,7 +47,7 @@ EnemyManager::EnemyManager(Engine* engine, const Heightmap& heightmap) {
|
||||
auto* death = engine->audio.adpcm.load(
|
||||
FileUtils::fromCwd("game/models/zombie/death.adpcm"));
|
||||
|
||||
const int enemyCount = 10;
|
||||
const int enemyCount = IS_REAL_PS2 ? 8 : 12;
|
||||
for (int i = 0; i < enemyCount; i++) {
|
||||
EnemyInfo info;
|
||||
info.adpcmChannel = 9 + i;
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
*/
|
||||
|
||||
#include "states/game/game_state.hpp"
|
||||
#include "game_settings.hpp"
|
||||
|
||||
using std::make_unique;
|
||||
using Tyra::FileUtils;
|
||||
@@ -44,6 +45,8 @@ void GameState::onStart() {
|
||||
|
||||
engine->audio.song.setVolume(85);
|
||||
|
||||
if (IS_REAL_PS2) engine->renderer.setFrameLimit(false);
|
||||
|
||||
initialized = true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user