aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common.cpp1
-rw-r--r--src/entities.cpp32
-rw-r--r--src/ui.cpp33
-rw-r--r--src/world.cpp8
4 files changed, 39 insertions, 35 deletions
diff --git a/src/common.cpp b/src/common.cpp
index 182b5b8..8dcbd11 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -31,4 +31,3 @@ void DEBUG_prints(const char* file, int line, const char *s,...){
vprintf(s,args);
va_end(args);
}
-
diff --git a/src/entities.cpp b/src/entities.cpp
index 32b74fe..2bc5a61 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -16,6 +16,8 @@ void Entity::spawn(float x, float y){ //spawns the entity you pass to it based o
ticksToUse = 0;
canMove = true;
ground = false;
+ alive = true;
+ if(!maxHealth)health = maxHealth = 50;
name = (char*)malloc(16);
getName();
}
@@ -156,12 +158,6 @@ void Entity::draw(void){ //draws the entities
glDisable(GL_TEXTURE_2D);
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
- if(type == PLAYERT){
- ui::setFontSize(16);
- ui::putText(((SCREEN_WIDTH / 2 ) + loc.x) - 125, SCREEN_HEIGHT - ui::fontSize, "Health: %d/%d",health,maxHealth);
- glColor3ub(255,0,0);
- glRectf((SCREEN_WIDTH / 2 + loc.x) - 125, SCREEN_HEIGHT - 32, ((SCREEN_WIDTH / 2 + loc.x) - 125) + (((float)health / (float)maxHealth) * 100), SCREEN_HEIGHT - 32 + 12);
- }
if(near){
ui::setFontSize(14);
ui::putText(loc.x,loc.y-ui::fontSize-HLINE/2,"%s",name);
@@ -217,31 +213,20 @@ void NPC::wander(int timeRun, vec2 *v){ //this makes the entites wander about
ticksToUse--; //removes one off of the entities timer
}
-static int (*AIpreload)(NPC *);
+std::vector<int (*)(NPC *)> AIpreload; // A dynamic array of AI functions that are being preloaded
+std::vector<void *> AIpreaddr; // A dynamic array of pointers to the NPC's that are being assigned the preloads
void NPC::addAIFunc(int (*func)(NPC *),bool preload){
- if(preload)
-#ifdef DEBUG
- {
+ if(preload){ // Preload AI functions so that they're given after
+#ifdef DEBUG // the current dialog box is closed
DEBUG_printf("Preloading an AI %x.\n",func);
#endif // DEBUG
- AIpreload=func;
-#ifdef DEBUG
+ AIpreload.push_back(func);
+ AIpreaddr.push_back(this);
}
-#endif // DEBUG
else aiFunc.push_back(func);
}
-void NPC::flushAIFunc(void){
- if(AIpreload){
-#ifdef DEBUG
- DEBUG_printf("Unloading preloaded AI function %x.\n",AIpreload);
-#endif // DEBUG
- aiFunc.push_back(AIpreload);
- AIpreload=NULL;
- }
-}
-
void NPC::interact(){ //have the npc's interact back to the player
int (*func)(NPC *);
loc.y += 5;
@@ -259,6 +244,7 @@ unsigned int Structures::spawn(_TYPE t, float x, float y){ //spawns a structure
loc.x = x;
loc.y = y;
type = t;
+ alive = true;
/*VILLAGE*/
//spawns a village
diff --git a/src/ui.cpp b/src/ui.cpp
index 2689766..a62086e 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -8,7 +8,8 @@
extern Player *player; // 'player' should be (must be) defined in main.cpp
extern World *currentWorld; // should/must also be defined in main.cpp
-extern std::vector<NPC>npc;
+extern std::vector<int (*)(NPC *)> AIpreload; // see entities.cpp
+extern std::vector<void *> AIpreaddr; //
static FT_Library ftl; // Variables for the FreeType library and stuff
static FT_Face ftf;
@@ -171,18 +172,31 @@ namespace ui {
setFontSize(16);
putString(x+HLINE,y-fontSize-HLINE,dialogBoxText);
}
+ setFontSize(16);
+ putText(((SCREEN_WIDTH/2)+player->loc.x)-125,SCREEN_HEIGHT-fontSize,"Health: %u/%u",player->health>0?(unsigned)player->health:0,
+ (unsigned)player->maxHealth);
+ if(player->alive){
+ glColor3ub(255,0,0);
+ glRectf((SCREEN_WIDTH/2+player->loc.x)-125,
+ SCREEN_HEIGHT-32,
+ ((SCREEN_WIDTH/2+player->loc.x)-125)+((player->health/player->maxHealth)*100),
+ SCREEN_HEIGHT-32+12);
+ }
}
void handleEvents(void){
static bool left=false,right=false;
+ static vec2 premouse={0,0};
SDL_Event e;
+ mouse.x=premouse.x+player->loc.x-(SCREEN_WIDTH/2);
+ mouse.y=SCREEN_HEIGHT-premouse.y;
while(SDL_PollEvent(&e)){
switch(e.type){
case SDL_QUIT:
gameRunning=false;
break;
case SDL_MOUSEMOTION:
- mouse.x=e.motion.x;
- mouse.y=e.motion.y;
+ premouse.x=e.motion.x;
+ premouse.y=e.motion.y;
break;
case SDL_MOUSEBUTTONDOWN:
if((e.button.button&SDL_BUTTON_RIGHT)&&dialogBoxExists){
@@ -244,13 +258,14 @@ namespace ui {
break;
}
}
- static bool once=false;
+
unsigned int i;
- if(!dialogBoxExists&&!once){
- for(i=0;i<npc.size();i++){
- npc[i].flushAIFunc();
+ if(!dialogBoxExists&&AIpreaddr.size()){ // Flush preloaded AI functions if necessary
+ for(i=0;i<AIpreaddr.size();i++){
+ NPCp(AIpreaddr.front())->addAIFunc(AIpreload.front(),false);
+ AIpreaddr.erase(AIpreaddr.begin());
+ AIpreload.erase(AIpreload.begin());
}
- once=true;
- }else once=false;
+ }
}
}
diff --git a/src/world.cpp b/src/world.cpp
index 1498016..3b1fd87 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -34,6 +34,7 @@ void World::generate(unsigned int width){ // Generates the world and sets all va
unsigned int i; // Used for 'for' loops
float inc; // See line 40
lineCount=width+GEN_INC; // Sets line count to the desired width plus GEN_INC to remove incorrect line calculations.
+ if(lineCount<=0)abort();
line=(struct line_t *)calloc(lineCount,sizeof(struct line_t)); // Allocate memory for the array 'line'
@@ -156,7 +157,9 @@ LOOP2: // Draw each world
void World::singleDetect(Entity *e){
unsigned int i;
- if(e->alive){
+ if(e->health<=0){
+ e->alive=false;
+ }else if(e->alive){
i=(e->loc.x+e->width/2-x_start)/HLINE; // Calculate what line the player is currently on
if(e->type==STRUCTURET||e->loc.y<line[i].y){
e->vel.y=0;
@@ -166,7 +169,7 @@ void World::singleDetect(Entity *e){
//std::cout<<e->loc.x<<" "<<e->loc.y<<std::endl;
return;
}
- }else if(e->loc.y>line[i].y-.002*deltaTime){ // Snap the player to the top of that line if the player is inside it
+ }else if(e->loc.y>line[i].y-.002*deltaTime){
for(i=0;i<platform.size();i++){
if(((e->loc.x+e->width>platform[i].p1.x)&(e->loc.x+e->width<platform[i].p2.x))||
((e->loc.x<platform[i].p2.x)&(e->loc.x>platform[i].p1.x))){
@@ -290,6 +293,7 @@ IndoorWorld::~IndoorWorld(void){
void IndoorWorld::generate(unsigned int width){ // Generates a flat area of width 'width'
unsigned int i; // Used for 'for' loops
lineCount=width+GEN_INC; // Sets line count to the desired width plus GEN_INC to remove incorrect line calculations.
+ if(lineCount<=0)abort();
line=(struct line_t *)calloc(lineCount,sizeof(struct line_t)); // Allocate memory for the array 'line'
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-05 11:02:17 +0000