js/Cube
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert player into a class

Browse source 
FossilOrigin-Name: 5b7b7d2fc5af4d512db195c4fbfb2aff01436db9bc1345d62263609ac129aa02
This commit is contained in:
Jonathan Schleifer 2025-03-24 22:14:24 +00:00
parent 4596a656dc
commit 5835957d74
25 changed files with 211 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Monster.m
View file

@ -4,8 +4,8 @@
#include "cube.h"
#import "DynamicEntity.h"
#import "Entity.h"
#import "Player.h"
static OFMutableArray<Monster *> *monsters;
static int nextmonster, spawnremain, numkilled, monstertotal, mtimestart;
@ -101,7 +101,7 @@ monstertypes[NUMMONSTERTYPES] = {
self.trigger = lastmillis + trigger;
self.targetYaw = self.yaw = (float)yaw;
self.move = move;
self.enemy = player1;
self.enemy = Player.player1;
self.gunSelect = t->gun;
self.maxSpeed = (float)t->speed;
self.health = t->health;
@ -256,7 +256,7 @@ enemylos(Monster *m, OFVector3D *v)
- (void)performAction
{
if (self.enemy.state == CS_DEAD) {
self.enemy = player1;
self.enemy = Player.player1;
self.anger = 0;
}
[self normalizeWithAngle:self.targetYaw];
@ -417,7 +417,7 @@ enemylos(Monster *m, OFVector3D *v)
self.state = CS_DEAD;
self.lastAction = lastmillis;
numkilled++;
player1.frags = numkilled;
Player.player1.frags = numkilled;
OFVector3D loc = self.origin;
playsound(monstertypes[self.monsterType].diesound, &loc);
int remain = monstertotal - numkilled;