Cube  Diff

// entities.cpp: map entity related functions (pickup etc.)

#include "cube.h"

#import "MapModelInfo.h"

vector<entity> ents;

static OFString *entmdlnames[] = {
    @"shells",
    @"bullets",
    @"rockets",
    @"rrounds",
    @"health",
    @"boost",
    @"g_armour",
    @"y_armour",
    @"quad",
    @"teleporter",
	@"shells",
	@"bullets",
	@"rockets",
	@"rrounds",
	@"health",
	@"boost",
	@"g_armour",
	@"y_armour",
	@"quad",
	@"teleporter",
};

int triggertime = 0;

void
renderent(entity &e, OFString *mdlname, float z, float yaw, int frame = 0,
    int numf = 1, int basetime = 0, float speed = 10.0f)

				if (e.type < I_SHELLS || e.type > TELEPORT)
					continue;
				renderent(e, entmdlnames[e.type - I_SHELLS],
				    (float)(1 +
				        sin(lastmillis / 100.0 + e.x + e.y) /
				            20),
				    lastmillis / 10.0f);
			} else
			} else {
				switch (e.attr2) {
				case 1:
				case 3:
					continue;

				case 2:
				case 0:

					    (float)e.attr3 * 90,
					    (!e.spawned && !triggertime) ? 30
					                                 : 0,
					    (e.spawned || !triggertime) ? 1
					                                : 30,
					    triggertime, 35.0f);
					break;
				};
		};
				}
			}
		}
	}
}

struct itemstat {
	int add, max, sound;
} itemstats[] = {
    10,
    50,
    S_ITEMAMMO,
	{ 10, 50, S_ITEMAMMO },
    20,
    100,
    S_ITEMAMMO,
	{ 20, 100, S_ITEMAMMO },
    5,
    25,
    S_ITEMAMMO,
	{ 5, 25, S_ITEMAMMO },
    5,
    25,
    S_ITEMAMMO,
	{ 5, 25, S_ITEMAMMO },
    25,
    100,
    S_ITEMHEALTH,
	{ 25, 100, S_ITEMHEALTH },
    50,
    200,
    S_ITEMHEALTH,
	{ 50, 200, S_ITEMHEALTH },
    100,
    100,
    S_ITEMARMOUR,
	{ 100, 100, S_ITEMARMOUR },
    150,
    150,
    S_ITEMARMOUR,
	{ 150, 150, S_ITEMARMOUR },
    20000,
    30000,
    S_ITEMPUP,
	{ 20000, 30000, S_ITEMPUP },
};

void
baseammo(int gun)
{
	player1->ammo[gun] = itemstats[gun - 1].add * 2;
}

			d->o.z = ents[e].z;
			d->yaw = ents[e].attr1;
			d->pitch = 0;
			d->vel.x = d->vel.y = d->vel.z = 0;
			entinmap(d);
			playsoundc(S_TELEPORT);
			break;
		};
	};
		}
	}
}

void
pickup(int n, dynent *d)
{
	int np = 1;
	loopv(players) if (players[i]) np++;

	case TELEPORT: {
		static int lastteleport = 0;
		if (lastmillis - lastteleport < 500)
			break;
		lastteleport = lastmillis;
		teleport(n, d);
		break;
	};
	}

	case JUMPPAD: {
		static int lastjumppad = 0;
		if (lastmillis - lastjumppad < 300)
			break;
		lastjumppad = lastmillis;
		OFVector3D v = OFMakeVector3D((int)(char)ents[n].attr3 / 10.0f,