Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-23 02:42:39 +01:00
Code Issues Projects Releases Activity

Add vehicle generator data and opcodes.

Browse Source
This commit is contained in:
Daniel Evans 2014-12-15 23:56:47 +00:00
parent a55bcc557d
commit 0ddc8458d1
2 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rwengine/include/engine/GameState.hpp
View File

@ -19,6 +19,30 @@ struct TextDisplayData
glm::vec4 colourBG;
};
/**
* Stores information about where the game can generate vehicles.
*/
struct VehicleGenerator
{
glm::vec3 position;
float heading;
/** ID of the vehicle to spawn, or -1 for random. */
int vehicleID;
int colourFG;
int colourBG;
bool alwaysSpawn;
short alarmThreshold;
short lockedThreshold;
int minDelay;
int maxDelay;
/** Incrementing timer (in ms), will only spawn a vehicle when minDelay < spawnTimer and will always spawn if maxDelay < spawnTimer */
int lastSpawnTime;
/** Number of vehicles left to spawn 0-100, 101 = never decrement. */
int remainingSpawns;
};
struct GameState
{
unsigned int maxProgress;
@ -68,6 +92,8 @@ struct GameState
/** The camera near value currently set by the script */
float cameraNear;
std::vector<VehicleGenerator> vehicleGenerators;
GameState() :
maxProgress(1),

41
rwengine/src/script/Opcodes3.cpp
View File

@ -191,6 +191,41 @@ VM_CONDOPCODE_DEF( 0x0121 )
return false;
}
VM_OPCODE_DEF( 0x014B )
{
glm::vec3 position(p->at(0).real, p->at(1).real, p->at(2).real);
if(p->at(4).type == TString)
{
std::cerr << "Model names not supported for vehicle generators" << std::endl;
return;
}
VehicleGenerator vg;
vg.position = position;
vg.heading = p->at(3).real;
vg.vehicleID = p->at(4).integer;
vg.colourFG = p->at(5).integer;
vg.colourBG = p->at(6).integer;
vg.alwaysSpawn = p->at(7).integer != 0;
vg.alarmThreshold = p->at(8).integer;
vg.lockedThreshold = p->at(9).integer;
vg.minDelay = p->at(10).integer;
vg.maxDelay = p->at(11).integer;
vg.lastSpawnTime = 0;
vg.remainingSpawns = 0;
*p->at(12).globalInteger = m->getWorld()->state.vehicleGenerators.size();
m->getWorld()->state.vehicleGenerators.push_back(vg);
}
VM_OPCODE_DEF( 0x014C )
{
VehicleGenerator& generator = m->getWorld()->state.vehicleGenerators.at(*p->at(0).globalInteger);
generator.remainingSpawns = p->at(1).integer;
}
VM_OPCODE_DEF( 0x0152 )
{
auto it = m->getWorld()->gameData.zones.find(p->at(0).string);
@ -759,10 +794,8 @@ Opcodes3::Opcodes3()
VM_CONDOPCODE_DEC( 0x0121, 2, "Is Player In Zone" );
VM_OPCODE_DEC_U( 0x014B, 13, "Create Car Generator" );
// 0 -> disable, 1-100 -> number, 101+ -> always
VM_OPCODE_DEC_U( 0x014C, 2, "Set Car Generator count" );
VM_OPCODE_DEC( 0x014B, 13, "Create Car Generator" );
VM_OPCODE_DEC( 0x014C, 2, "Set Car Generator count" );
VM_OPCODE_DEC( 0x0152, 17, "Set zone car info" );