aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile2
-rw-r--r--src/Quest.cpp11
-rw-r--r--src/Texture.cpp2
-rw-r--r--src/common.cpp26
-rw-r--r--src/entities.cpp18
-rw-r--r--src/gameplay.cpp7
-rw-r--r--src/inventory.cpp187
-rw-r--r--src/ui.cpp13
8 files changed, 164 insertions, 102 deletions
diff --git a/src/Makefile b/src/Makefile
index f40ab90..03652fc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-LIBS = -lGL -lSDL2 -lSDL2_image -lSDL2_mixer -lfreetype
+LIBS = -lpthread -lGL -lSDL2 -lSDL2_image -lSDL2_mixer -lfreetype
FLAGS = -std=c++11 -I../include -I../include/freetype2
diff --git a/src/Quest.cpp b/src/Quest.cpp
index 5fd7726..6789a05 100644
--- a/src/Quest.cpp
+++ b/src/Quest.cpp
@@ -14,15 +14,6 @@ const Quest QuestList[TOTAL_QUESTS]={
};
-// Trust nobody
-#define STRLEN_MIN 16
-
-unsigned int safe_strlen(const char *s){
- unsigned int size=0;
- while(s[size])size++;
- if(size<STRLEN_MIN)return STRLEN_MIN;
- else return size;
-}
Quest::Quest(const char *t,const char *d,struct item_t r){
title=(char *)calloc(safe_strlen(t),sizeof(char));
@@ -85,7 +76,7 @@ int QuestHandler::finish(const char *t,void *completer){
#ifdef DEBUG
DEBUG_printf("Completing quest %s.\n",t);
#endif // DEBUG
- ((Entity *)completer)->inv->addItem(current[i]->reward.itmid,current[i]->reward.count);
+ ((Entity *)completer)->inv->addItem(current[i]->reward.id,current[i]->reward.count);
current.erase(current.begin()+i);
#ifdef DEBUG
DEBUG_printf("QuestHandler now has %u active quests.\n",current.size());
diff --git a/src/Texture.cpp b/src/Texture.cpp
index b17d204..82baa71 100644
--- a/src/Texture.cpp
+++ b/src/Texture.cpp
@@ -54,7 +54,7 @@ namespace Texture{
SDL_FreeSurface(image); // Free the surface
LoadedTexture[LoadedTextureCounter] = (struct texture_t *)malloc(sizeof(struct texture_t));
- LoadedTexture[LoadedTextureCounter]->name = (char *)malloc(strlen(fileName));
+ LoadedTexture[LoadedTextureCounter]->name = (char *)malloc(safe_strlen(fileName));
LoadedTexture[LoadedTextureCounter]->tex = object;
strcpy(LoadedTexture[LoadedTextureCounter]->name,fileName);
LoadedTextureCounter++;
diff --git a/src/common.cpp b/src/common.cpp
index a8a964e..f3c3999 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -32,3 +32,29 @@ void safeSetColorA(int r,int g,int b,int a){
if(a<0)a=0;
glColor4ub(r,g,b,a);
}
+
+//only trust the NSA
+#define STRLEN_MIN 32
+
+unsigned int safe_strlen(const char *s){
+ unsigned int size=0;
+ while(s[size])size++;
+ if(size<STRLEN_MIN)return STRLEN_MIN;
+ else return size;
+}
+
+void DrawCircle(float cx, float cy, float r, int num_segments)
+{
+ glBegin(GL_LINE_LOOP);
+ for(int ii = 0; ii < num_segments; ii++)
+ {
+ float theta = 2.0f * 3.1415926f * float(ii) / float(num_segments);//get the current angle
+
+ float x = r * cosf(theta);//calculate the x component
+ float y = r * sinf(theta);//calculate the y component
+
+ glVertex2f(x + cx, y + cy);//output vertex
+
+ }
+ glEnd();
+} \ No newline at end of file
diff --git a/src/entities.cpp b/src/entities.cpp
index af32cd6..c2c560a 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -108,7 +108,7 @@ Object::Object(int id):identifier(id){
height = HLINE * 8;
maxHealth = health = 1;
- tex = new Texturec(1, "assets/items/ITEM_SWORD.png");
+ tex = new Texturec(1, item[id].textureLoc);
questObject = false;
pickupDialog="\0";
@@ -122,7 +122,7 @@ Object::Object(int id, bool qo, char *pd):identifier(id),questObject(qo),pickupD
height = HLINE * 8;
maxHealth = health = 1;
- tex = new Texturec(1, "assets/items/ITEM_SWORD.png");
+ tex = new Texturec(1, item[id].textureLoc);
}
@@ -316,14 +316,16 @@ void NPC::interact(){ //have the npc's interact back to the player
}
extern void waitForDialog(void);
-void Object::interact(){
+void Object::interact(void){
if(questObject){
- char opt[]=":No:Yes";
+ char opt[]=":Yes:No";
ui::dialogBox("You",opt,pickupDialog);
- if(ui::dialogOptChosen == 1){
- this->alive = false;
- player->inv->addItem((ITEM_ID)(identifier), (char)1);
- }
+ do{
+ if(ui::dialogOptChosen == 1 && this->alive == true){
+ player->inv->addItem((ITEM_ID)(identifier), (char)1);
+ this->alive = false;
+ }
+ }while(ui::dialogBoxExists);
}else{
this->alive = false;
player->inv->addItem((ITEM_ID)(identifier), (char)1);
diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index 52aceb8..6e85b6d 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -162,6 +162,13 @@ void initEverything(void){
currentWorld->addObject(SWORD_WOOD, false, NULL, 500,200);
currentWorld->addObject(FLASHLIGHT, true, "This looks important, do you want to pick it up?",600,200);
+
+ /*currentWorld->addObject(DEBUG_ITEM, 500,200);
+ currentWorld->addObject(TEST_ITEM, 550,200);
+ currentWorld->addObject(PLAYER_BAG, 600,200);
+ currentWorld->addObject(SWORD_WOOD, 650,200);
+ currentWorld->addObject(FLASHLIGHT, true, "This looks important, do you want to pick it up?",700,200);
+ */
/*
* Link all the entities that were just created to the initial world, and setup a test AI function.
*/
diff --git a/src/inventory.cpp b/src/inventory.cpp
index edc88ff..2547760 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -7,26 +7,12 @@
extern Player *player;
extern GLuint invUI;
-GLuint *ITEM_TEX;
-
void itemDraw(Player *p,ITEM_ID id);
-unsigned int initInventorySprites(void){
- unsigned int i,loadCount=0;
- ITEM_TEX=(GLuint *)calloc(ITEM_COUNT,sizeof(GLuint));
- for(i=0;i<ITEM_COUNT;i++){
- if((ITEM_TEX[i]=Texture::loadTexture(item[i].textureLoc)))loadCount++;
- }
-#ifdef DEBUG
- DEBUG_printf("Loaded %u/%u item texture(s).\n",loadCount,ITEM_COUNT);
-#endif // DEBUG
- return loadCount;
-}
-
Inventory::Inventory(unsigned int s){
sel=0;
size=s;
- //item=(struct item_t *)calloc(size,sizeof(struct item_t));
+ inv=(struct item_t *)calloc(size,sizeof(struct item_t));
tossd=false;
}
@@ -39,43 +25,29 @@ void Inventory::setSelection(unsigned int s){
}
int Inventory::addItem(ITEM_ID id,unsigned char count){
- unsigned int i;
-
- for(i=0;i<size;i++){
- if(item[i].id==id){
- item[i].count+=count;
-
- #ifdef DEBUG
- DEBUG_printf("Gave player %u more %s(s).\n",count,item[i].name);
- #endif // DEBUG
-
- return 0;
- }else if(!item[i].count){
- item[i].id=id;
- item[i].count=count;
+ inv[os].id = id;
+ inv[os].count = count;
+ os++;
- #ifdef DEBUG
- DEBUG_printf("Gave player %u %s(s).\n",count,item[i].name);
- #endif // DEBUG
- return 0;
- }
- }
+ #ifdef DEBUG
+ DEBUG_printf("Gave player %u more %s(s)(%d).\n",count,item[id].name,item[id].id);
+ #endif // DEBUG
-#ifdef DEBUG
+ /*#ifdef DEBUG
DEBUG_printf("Failed to add non-existant item with id %u.\n",id);
-#endif // DEBUG
- return -1;
+ #endif // DEBUG*/
+ return 0;
}
int Inventory::takeItem(ITEM_ID id,unsigned char count){
unsigned int i;
for(i=0;i<size;i++){
- if(item[i].id==id){
+ if(inv[i].id==id){
#ifdef DEBUG
DEBUG_printf("Took %u of player's %s(s).\n",count,item[i].name);
#endif // DEBUG
- item[i].count-=count;
+ inv[i].count-=count;
if(item[i].count<0)
return item[i].count*-1;
return 0;
@@ -85,36 +57,104 @@ int Inventory::takeItem(ITEM_ID id,unsigned char count){
}
void Inventory::draw(void){
+ ui::putText(offset.x-SCREEN_WIDTH/2,480,"%d",sel);
unsigned int i=0;
- float y=offset.y,xoff;
- glEnable(GL_TEXTURE_2D);
- glBindTexture(GL_TEXTURE_2D, invUI);
- glBegin(GL_QUADS);
- glTexCoord2i(0,1);glVertex2i(offset.x-SCREEN_WIDTH/2, 0);
- glTexCoord2i(1,1);glVertex2i(offset.x-SCREEN_WIDTH/2+261, 0);
- glTexCoord2i(1,0);glVertex2i(offset.x-SCREEN_WIDTH/2+261, 57);
- glTexCoord2i(0,0);glVertex2i(offset.x-SCREEN_WIDTH/2, 57);
- glEnd();
- glDisable(GL_TEXTURE_2D);
- while(item[i].count){
- y-=HLINE*12;
- xoff=ui::putText(offset.x-SCREEN_WIDTH/2,y,"%d x ",item[i].count);
+ float y,xoff;
+
+
+ static int numSlot = 7;
+ static std::vector<int>dfp(numSlot);
+ static std::vector<Ray>iray(numSlot);
+ static std::vector<vec2>curCoord(numSlot);
+ static int range = 200;
+ float angleB = (float)180/(float)numSlot;
+ float angle = float(angleB/2.0f);
+ unsigned int a = 0;
+ unsigned int end = 0;
+ for(auto &r : iray){
+ r.start = player->loc;
+ curCoord[a] = r.start;
+ //dfp[a] = 0;
+ a++;
+ }a=0;
+ if(invOpening){
+ end = 0;
+ for(auto &d : dfp){
+ if(a != 0){
+ if(dfp[a-1]>25)d+=25;
+ }else{
+ d += 25;
+ }
+ if(d >= range)
+ d = range;
+ a++;
+ }a=0;
+ if(end < numSlot)invOpen=true;
+ }else if(!invOpening){
+ for(auto &d : dfp){
+ if(d > 0){
+ if(a != 0){
+ //d-=25;
+ if(dfp[a-1]+25<d || dfp[a-1]<=0)d-=25;
+ }else{
+ d-=25;
+ }
+ }else end++;
+ a++;
+ }a=0;
+ if(end >= numSlot)invOpen=false;
+ }
+ if(invOpen){
+ for(auto &r : iray){
+ angle=180-(angleB*a) - angleB/2.0f;
+ curCoord[a].x += float((dfp[a]) * cos(angle*PI/180));
+ curCoord[a].y += float((dfp[a]) * sin(angle*PI/180));
+ r.end = curCoord[a];
+
+ item[inv[i].id].tex->bind(0);
+ glColor4f(1.0f, 1.0f, 1.0f, (float)dfp[a]/(float)range);
+ glBegin(GL_QUADS);
+ glTexCoord2i(0,1);glVertex2i(r.end.x, r.end.y);
+ glTexCoord2i(1,1);glVertex2i(r.end.x+45, r.end.y);
+ glTexCoord2i(1,0);glVertex2i(r.end.x+45, r.end.y+45);
+ glTexCoord2i(0,0);glVertex2i(r.end.x, r.end.y+45);
+ glEnd();
+ a++;
+ }
+ }
+
+
+ /*else if(!invOpen){
+ for(auto &d : dfp){
+ d = 0;
+ }
glEnable(GL_TEXTURE_2D);
- glBindTexture(GL_TEXTURE_2D,ITEM_TEX[item[i].id]);
- if(sel==i)glColor3ub(255,0,255);
- else glColor3ub(255,255,255);
+ glBindTexture(GL_TEXTURE_2D, invUI);
glBegin(GL_QUADS);
- glTexCoord2i(0,1);glVertex2i(xoff ,y);
- glTexCoord2i(1,1);glVertex2i(xoff+HLINE*10,y);
- glTexCoord2i(1,0);glVertex2i(xoff+HLINE*10,y+HLINE*10);
- glTexCoord2i(0,0);glVertex2i(xoff ,y+HLINE*10);
+ glTexCoord2i(0,1);glVertex2i(offset.x-SCREEN_WIDTH/2, 0);
+ glTexCoord2i(1,1);glVertex2i(offset.x-SCREEN_WIDTH/2+261, 0);
+ glTexCoord2i(1,0);glVertex2i(offset.x-SCREEN_WIDTH/2+261, 57);
+ glTexCoord2i(0,0);glVertex2i(offset.x-SCREEN_WIDTH/2, 57);
glEnd();
- y-=ui::fontSize*1.15;
- ui::putText(offset.x-SCREEN_WIDTH/2,y,"%s",item[i].name);
glDisable(GL_TEXTURE_2D);
- i++;
- }
- if(item[sel].count)itemDraw(player,item[sel].id);
+ while(i<size && inv[i].count > 0 && i<5){
+ y = 6;
+ xoff = (offset.x - (SCREEN_WIDTH /2)) + (51*i) + 6;
+ glEnable(GL_TEXTURE_2D);
+ item[inv[i].id].tex->bind(0);
+ if(sel==i)glColor3ub(255,0,255);
+ else glColor3ub(255,255,255);
+ glBegin(GL_QUADS);
+ glTexCoord2i(0,1);glVertex2i(xoff, y);
+ glTexCoord2i(1,1);glVertex2i(xoff+45, y);
+ glTexCoord2i(1,0);glVertex2i(xoff+45, y+45);
+ glTexCoord2i(0,0);glVertex2i(xoff, y+45);
+ glEnd();
+ glDisable(GL_TEXTURE_2D);
+ i++;
+ }
+ }*/
+ if(inv[sel].count)itemDraw(player,inv[sel].id);
}
static vec2 item_coord = {0,0};
@@ -126,7 +166,7 @@ void itemDraw(Player *p,ITEM_ID id){
static vec2 p1,p2;
if(!id)return;
glEnable(GL_TEXTURE_2D);
- glBindTexture(GL_TEXTURE_2D,ITEM_TEX[id-1]);
+ item[id].tex->bind(0);
if(!yes){
p1 = {p->loc.x+p->width/2,
p->loc.y+p->width/2+HLINE*3};
@@ -134,23 +174,24 @@ void itemDraw(Player *p,ITEM_ID id){
p->loc.y+HLINE*3};
}
if(p->inv->tossd) yes=true;
+ glColor4ub(255,255,255,255);
glBegin(GL_QUADS);
glTexCoord2i(0,1);glVertex2f(item_coord.x+p->loc.x, item_coord.y+p->loc.y);
- glTexCoord2i(1,1);glVertex2f(item_coord.x+item[sel].width+p->loc.x, item_coord.y+p->loc.y);
- glTexCoord2i(1,0);glVertex2f(item_coord.x+item[sel].width+p->loc.x, item_coord.y+item[sel].height+p->loc.y);
- glTexCoord2i(0,0);glVertex2f(item_coord.x+p->loc.x, item_coord.y+item[sel].height+p->loc.y);
+ glTexCoord2i(1,1);glVertex2f(item_coord.x+item[id].width+p->loc.x, item_coord.y+p->loc.y);
+ glTexCoord2i(1,0);glVertex2f(item_coord.x+item[id].width+p->loc.x, item_coord.y+item[id].height+p->loc.y);
+ glTexCoord2i(0,0);glVertex2f(item_coord.x+p->loc.x, item_coord.y+item[id].height+p->loc.y);
glEnd();
glDisable(GL_TEXTURE_2D);
}
int Inventory::useItem(void){
- ITEM_ID id = item[sel].id;
+ ITEM_ID id = item[inv[sel].id].id;
switch(id){
- case SWORD_WOOD:
-
+ case FLASHLIGHT:
+ player->light ^= true;
break;
default:
- ui::dialogBox(item[id].name,NULL,"You cannot use this item.");
+ //ui::dialogBox(item[id].name,NULL,"You cannot use this item.");
break;
}
return 0;
diff --git a/src/ui.cpp b/src/ui.cpp
index 21df830..790248b 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -527,7 +527,7 @@ DONE:
KEYDOWN
*/
case SDL_KEYDOWN:
- if(SDL_KEY==SDLK_ESCAPE)gameRunning=false; // Exit the game with ESC
+ if(SDL_KEY==SDLK_ESCAPE)gameRunning=false; // Exit the game with ESC
if(!dialogBoxExists&&!fadeEnable){
if(SDL_KEY==SDLK_a){ // Move left
left=true;
@@ -583,17 +583,12 @@ DONE:
if(SDL_KEY==SDLK_q){
player->inv->itemToss();
}
- if(SDL_KEY==SDLK_e){
- player->inv->useItem();
- }
if(SDL_KEY==SDLK_LSHIFT)player->speed = debug?4:3; // Sprint
if(SDL_KEY==SDLK_LCTRL)player->speed = .5;
}
if(SDL_KEY==SDLK_p)toggleBlack();
if(SDL_KEY==SDLK_F3)debug^=true;
if(SDL_KEY==SDLK_b & SDL_KEY==SDLK_F3)posFlag^=true;
- if(SDL_KEY==SDLK_UP)handAngle++;
- if(SDL_KEY==SDLK_DOWN)handAngle--;
break;
/*
KEYUP
@@ -606,9 +601,9 @@ DONE:
if(SDL_KEY==SDLK_LCTRL)player->speed = 1;
if(SDL_KEY==SDLK_h)player->health-=5;
if(SDL_KEY==SDLK_f)player->light ^= true;
- if(SDL_KEY==SDLK_UP)handAngle+=0;
- if(SDL_KEY==SDLK_DOWN)handAngle-=0;
-
+ if(SDL_KEY==SDLK_e)player->inv->invOpening ^= true;
+ if(SDL_KEY==SDLK_RIGHT){player->inv->sel+=1;}
+ if(SDL_KEY==SDLK_LEFT){if(player->inv->sel!=0)player->inv->sel-=1;}
break;
default:
break;
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-06 01:09:45 +0000