aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Quest.cpp10
-rw-r--r--src/config.cpp23
-rw-r--r--src/entities.cpp57
-rw-r--r--src/gameplay.cpp13
-rw-r--r--src/inventory.cpp101
-rw-r--r--src/ui.cpp10
-rw-r--r--src/world.cpp28
7 files changed, 81 insertions, 161 deletions
diff --git a/src/Quest.cpp b/src/Quest.cpp
index 4328dc5..f0be63c 100644
--- a/src/Quest.cpp
+++ b/src/Quest.cpp
@@ -1,11 +1,11 @@
#include <Quest.h>
-const Quest QuestList[1] = {
+/*const Quest QuestList[1] = {
Quest("Not a quest","Stop",(struct item_t){0,0})
-};
+};*/
-Quest::Quest(const char *t,const char *d,struct item_t r){
+/*Quest::Quest(const char *t,const char *d,struct item_t r){
title = new char[strlen(t)+1];
desc = new char[strlen(d)+1];
strcpy(title,t);
@@ -17,7 +17,7 @@ Quest::~Quest(){
delete[] title;
delete[] desc;
memset(&reward,0,sizeof(struct item_t));
-}
+}*/
int QuestHandler::assign(const char *t){
/*unsigned char i;
@@ -82,7 +82,7 @@ int QuestHandler::finish(const char *t,void *completer){
bool QuestHandler::hasQuest(const char *t){
unsigned int i;
for(i=0;i<current.size();i++){
- if(!strcmp(current[i]->title,t)){
+ if(!strcmp(current[i].title.c_str(),t)){
return true;
}
}
diff --git a/src/config.cpp b/src/config.cpp
index 0ed39fd..9f9b05e 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -15,12 +15,31 @@ XMLDocument xml;
void readConfig(void){
XMLElement *scr;
XMLElement *vol;
+
+ unsigned int uval;
+ bool bval;
+ //float fval;
+
xml.LoadFile("config/settings.xml");
scr = xml.FirstChildElement("screen");
- SCREEN_WIDTH = scr->UnsignedAttribute("width");
+
+ if(scr->QueryUnsignedAttribute("width",&uval) == XML_NO_ERROR)
+ SCREEN_WIDTH = uval;
+ else SCREEN_WIDTH = 1280;
+ if(scr->QueryUnsignedAttribute("height",&uval) == XML_NO_ERROR)
+ SCREEN_HEIGHT = uval;
+ else SCREEN_HEIGHT = 800;
+ if(scr->QueryBoolAttribute("fullscreen",&bval) == XML_NO_ERROR)
+ FULLSCREEN = bval;
+ else FULLSCREEN = false;
+ if(xml.FirstChildElement("hline")->QueryUnsignedAttribute("size",&uval) == XML_NO_ERROR)
+ HLINE = uval;
+ else HLINE = 3;
+
+ /*SCREEN_WIDTH = scr->UnsignedAttribute("width");
SCREEN_HEIGHT = scr->UnsignedAttribute("height");
FULLSCREEN = scr->BoolAttribute("fullscreen");
- HLINE = xml.FirstChildElement("hline")->UnsignedAttribute("size");
+ HLINE = xml.FirstChildElement("hline")->UnsignedAttribute("size");*/
vol = xml.FirstChildElement("volume");
VOLUME_MASTER = vol->FirstChildElement("master")->FloatAttribute("volume");
diff --git a/src/entities.cpp b/src/entities.cpp
index 4c1d326..caf3d59 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -2,7 +2,6 @@
#include <ui.h>
#include <istream>
-//#include <unistd.h>
extern std::istream *names;
extern unsigned int loops;
@@ -105,7 +104,6 @@ Player::Player(){ //sets all of the player specific traits on object creation
"assets/playerk6.png",
"assets/playerk7.png",
"assets/playerk8.png");
- //tex = new Texturec(3, "assets/maybeplayer.png", "assets/maybeplayer.png", "assets/maybeplayer.png");
inv = new Inventory(PLAYER_INV_SIZE);
}
Player::~Player(){
@@ -214,8 +212,7 @@ Object::Object(){
inv = NULL;
}
-Object::Object(/*ITEM_ID id*/std::string in, const char *pd){
- //identifier = id;
+Object::Object(std::string in, const char *pd){
iname = in;
if(pd){
@@ -256,7 +253,6 @@ void Object::reloadTexture(void){
void Entity::draw(void){ //draws the entities
glPushMatrix();
glColor3ub(255,255,255);
- //glUniform1i(glGetUniformLocation(shaderProgram, "sampler"), 0);
if(type==NPCT){
if(NPCp(this)->aiFunc.size()){
glColor3ub(255,255,0);
@@ -279,7 +275,6 @@ void Entity::draw(void){ //draws the entities
case PLAYERT:
static int texState = 0;
if(speed && !(loops % (int)(2.0f/(float)speed))){
- //currentWorld->addParticle(loc.x,loc.y-HLINE,HLINE,HLINE,0,0,{0.0f,.17f,0.0f},1000);
if(++texState==9)texState=1;
glActiveTexture(GL_TEXTURE0);
tex->bind(texState);
@@ -316,20 +311,9 @@ void Entity::draw(void){ //draws the entities
case STRUCTURET:
for(auto &strt : currentWorld->build){
if(this == strt){
- switch(strt->bsubtype){
- /*case HOUSE:
- glActiveTexture(GL_TEXTURE1);
- ntex->bind(0);
- //When rendering an objectwith this program.
- glActiveTexture(GL_TEXTURE0);
- tex->bind(0);
- //glBindSampler(0, linearFiltering);
- break;*/
- default:
- glActiveTexture(GL_TEXTURE0);
- tex->bind(0);
- break;
- }
+ glActiveTexture(GL_TEXTURE0);
+ tex->bind(0);
+ break;
}
}
break;
@@ -355,8 +339,7 @@ NOPE:
if(near)ui::putStringCentered(loc.x+width/2,loc.y-ui::fontSize-HLINE/2,name);
}
-void Player::interact(){ //the function that will cause the player to search for things to interact with
-
+void Player::interact(){
}
/*
@@ -483,15 +466,8 @@ unsigned int Structures::spawn(BUILD_SUB sub, float x, float y){
* tempN is the amount of entities that will be spawned in the village. Currently the village
* will spawn bewteen 2 and 7 villagers for the starting hut.
*/
- /* tex = new Texturec(7,"assets/townhall.png",
- "assets/house1.png",
- "assets/house2.png",
- "assets/house1.png",
- "assets/house1.png",
- "assets/fountain1.png",
- "assets/lampPost1.png")*/;
- unsigned int tempN = (getRand() % 5 + 2);
+ //unsigned int tempN = (getRand() % 5 + 2);
switch(sub){
case TOWN_HALL:
tex = new Texturec(1, sTexLoc[sub].c_str());
@@ -503,15 +479,6 @@ unsigned int Structures::spawn(BUILD_SUB sub, float x, float y){
tex = new Texturec(1, sTexLoc[sub].c_str());
width = 50 * HLINE;
height = 40 * HLINE;
- for(unsigned int i = 0;i < tempN;i++){
-
- /*
- * This is where the entities actually spawn. A new entity is created
- * with type NPC.
- */
-
- //oi->addNPC(loc.x + i * HLINE ,100);
- }
break;
case FOUNTAIN:
tex = new Texturec(1, sTexLoc[sub].c_str());
@@ -522,13 +489,11 @@ unsigned int Structures::spawn(BUILD_SUB sub, float x, float y){
tex = new Texturec(1, sTexLoc[sub].c_str());
width = 10 * HLINE;
height = 40 * HLINE;
- //oi->addLight({x+SCREEN_WIDTH/2,y+30*HLINE},{1.0f,1.0f,1.0f});
break;
case FIRE_PIT:
tex = new Texturec(1, sTexLoc[sub].c_str());
width = 12 * HLINE;
height = 12 * HLINE;
- //oi->addLight({x+SCREEN_WIDTH/2,y},{1.0f,1.0f,1.0f});
break;
default:
break;
@@ -559,7 +524,6 @@ void Mob::wander(int timeRun){
YAYA = false;
currentWorld = a;
ui::toggleWhiteFast();
- //player->health-=5;
}
switch(subtype){
@@ -587,13 +551,8 @@ void Mob::wander(int timeRun){
break;
case MS_TRIGGER:
if(player->loc.x + player->width / 2 > loc.x &&
- player->loc.x + player->width / 2 < loc.x + width ){
- //if(!vfork()){
- hey(this);
- /*_exit(0);
- }*/
-
- }
+ player->loc.x + player->width / 2 < loc.x + width )
+ hey(this);
break;
case MS_PAGE:
if(player->loc.x > loc.x - 100 &&
diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index 724ca9c..bf37256 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -60,6 +60,19 @@ int commonAIFunc(NPC *speaker){
do{
if(!strcmp(exml->Name(),"text")){
if(exml->UnsignedAttribute("id") == (unsigned)speaker->dialogIndex){
+
+ /*
+ * Handle any quest tags
+ */
+
+ if((oxml = exml->FirstChildElement("quest"))){
+ const char *qname;
+ while(oxml){
+ if((qname = oxml->Attribute("assign")))
+ player->qh.current.push_back((Quest){qname,"None",(struct item_t){0,0}});
+ oxml = oxml->NextSiblingElement();
+ }
+ }
/*
* Handle any 'give' requests.
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 4d94831..de60030 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -71,11 +71,7 @@ int Inventory::takeItem(std::string name,uint count){
return -1;
}
-/*static const Item item[ITEM_COUNT]= {
- #include "../config/items.h"
-};*/
-
-static GLuint *itemtex;//[ITEM_COUNT];
+static GLuint *itemtex;
void itemDraw(Player *p,uint id);
void initInventorySprites(void){
@@ -103,10 +99,6 @@ const char *getItemTexturePath(std::string name){
return NULL;
}
-/*char *getItemTexturePath(ITEM_ID id){
- return item[id].textureLoc;
-}*/
-
float getItemWidth(std::string name){
for(auto &i : itemMap){
if(i->name == name)
@@ -115,10 +107,6 @@ float getItemWidth(std::string name){
return 0;
}
-/*int getItemWidth(ITEM_ID id){
- return item[id].width;
-}*/
-
float getItemHeight(std::string name){
for(auto &i : itemMap){
if(i->name == name)
@@ -127,74 +115,18 @@ float getItemHeight(std::string name){
return 0;
}
-/*int getItemHeight(ITEM_ID id){
- return item[id].height;
-}*/
-
-/*Item::Item(ITEM_ID i, const char *n, ITEM_TYPE t, float w, float h, int m, const char *tl){
- id = i;
- type = t;
- width = w;
- height = h;
- maxStackSize = m;
-
- name = new char[strlen(n)+1];
- textureLoc = new char[strlen(tl)+1];
-
- strcpy(name,n);
- strcpy(textureLoc,tl);
-
- //tex= new Texturec(1,textureLoc);
-}*/
-
Inventory::Inventory(unsigned int s){
sel=0;
size=s;
- //inv = new struct item_t[size];
- //memset(inv,0,size*sizeof(struct item_t));
}
Inventory::~Inventory(void){
- //delete[] inv;
}
void Inventory::setSelection(unsigned int s){
sel=s;
}
-/*int Inventory::addItem(ITEM_ID id,unsigned char count){
- //std::cout << id << "," << inv[os].id << std::endl;
-
- for(unsigned int i = 0; i < size; i++){
- if(inv[i].id == id){
- inv[i].count += count;
- return 0;
- }
- }
- inv[os].id = id;
- inv[os].count += count;
- os++;
-
-#ifdef DEBUG
- DEBUG_printf("Gave player %u more %s(s)(ID: %d).\n",count,item[id].name,item[id].id);
-#endif // DEBUG
-
- return 0;
-}*/
-
-/*int Inventory::takeItem(ITEM_ID id,unsigned char count){
- for(unsigned int i = 0;i < size;i++){
- if(inv[i].id == id){
-#ifdef DEBUG
- DEBUG_printf("Took %u of player's %s(s).\n",count,item[i].name);
-#endif // DEBUG
- inv[i].count-=count;
- return 0;
- }
- }
- return -1;
-}*/
-
void Inventory::draw(void){
static unsigned int lop = 0;
const unsigned int numSlot = 7;
@@ -213,13 +145,9 @@ void Inventory::draw(void){
r.start.x = player->loc.x + (player->width/2);
r.start.y = player->loc.y + (player->height/2);
curCoord[a++] = r.start;
- //dfp[a] = 0;
- //a++;
}a=0;
- if(invOpening){
- //end = 0;
-
+ if(invOpening){
for(auto &d : dfp){
if(!a || dfp[a - 1] > 50)
d += 1.65 * deltaTime;
@@ -228,7 +156,6 @@ void Inventory::draw(void){
a++;
}a=0;
- // if(end < numSlot)
if(numSlot > 0)invOpen=true;
}else{
for(auto &d : dfp){
@@ -262,10 +189,10 @@ void Inventory::draw(void){
if(!items.empty() && a < items.size() && items[a].count){
glEnable(GL_TEXTURE_2D);
- glBindTexture(GL_TEXTURE_2D, itemtex[items[a].id/*inv[a].id*/]);
+ glBindTexture(GL_TEXTURE_2D, itemtex[items[a].id]);
glColor4f(1.0f, 1.0f, 1.0f, ((float)dfp[a]/(float)(range?range:1))*0.8f);
glBegin(GL_QUADS);
- if(itemMap[items[a].id]->height > itemMap[items[a].id]->width){//item[inv[a].id].width){
+ if(itemMap[items[a].id]->height > itemMap[items[a].id]->width){
glTexCoord2i(0,1);glVertex2i(r.end.x-((itemWide/2)*((float)itemMap[items[a].id]->width/(float)itemMap[items[a].id]->height)), r.end.y-(itemWide/2));
glTexCoord2i(1,1);glVertex2i(r.end.x+((itemWide/2)*((float)itemMap[items[a].id]->width/(float)itemMap[items[a].id]->height)), r.end.y-(itemWide/2));
glTexCoord2i(1,0);glVertex2i(r.end.x+((itemWide/2)*((float)itemMap[items[a].id]->width/(float)itemMap[items[a].id]->height)), r.end.y+(itemWide/2));
@@ -284,7 +211,7 @@ void Inventory::draw(void){
a++;
- if(sel == a){
+ if(sel == a - 1){
glBegin(GL_LINES);
glColor4f(1.0f, 0.0f, 0.0f, 0.0f);
glVertex2i(r.start.x,r.start.y);
@@ -359,14 +286,13 @@ void Inventory::draw(void){
}
glEnd();
glDisable(GL_TEXTURE_2D);
- //ui::putText(r.end.x-(itemWide/2)+(itemWide*.85),r.end.y-(itemWide/1.75),"%d",inv[a].count);
a++;
}
ui::putStringCentered(player->loc.x+player->width/2, player->loc.y + range*.75,itemMap[items[highlight].id]->name.c_str());
}
- if(!items.empty() && items[sel].count)
+ if(!items.empty() && items.size() > sel && items[sel].count)
itemDraw(player,items[sel].id);
lop++;
}
@@ -383,13 +309,11 @@ void itemDraw(Player *p,uint id){
if(hangle < 15){
hangle=15.0f;
p->inv->usingi = false;
- //swing=false;
}
}else{
if(hangle > -15){
hangle=-15.0f;
p->inv->usingi = false;
- //swing=false;
}
}
}else hangle = 0.0f;
@@ -416,7 +340,6 @@ void itemDraw(Player *p,uint id){
int Inventory::useItem(void){
static bool up = false;
- //ITEM_TYPE type = item[inv[sel].id].type;
if(!invHover){
if(itemMap[items[sel].id]->type == "Sword"){
@@ -430,23 +353,11 @@ int Inventory::useItem(void){
if(hangle==15){up=true;Mix_PlayChannel(2,swordSwing,0);}
if(up)hangle+=.75*deltaTime;
if(hangle>=90)hangle=14;
- /*
- if(hangle<90&&!up)hangle+=.75*deltaTime;
- if(hangle>=90&&!up)up=true;
- if(up)hangle-=.75*deltaTime;
- if(up&&hangle<=15){
- up=false;
- swing=false;
- hangle=15;
- return 0;
- }*/
}
}else if(!swing){
swing=true;
Mix_PlayChannel(2,swordSwing,0);
}
- //hangle++;
- //break;
}
}
return 0;
diff --git a/src/ui.cpp b/src/ui.cpp
index 91fa279..65e1673 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -221,13 +221,13 @@ namespace ui {
* making it white-on-black.
*/
- buf = new char[ftf->glyph->bitmap.width * ftf->glyph->bitmap.rows * 4]; //(char *)malloc(ftf->glyph->bitmap.width*ftf->glyph->bitmap.rows*4);
+ buf = new char[ftf->glyph->bitmap.width * ftf->glyph->bitmap.rows * 4];
for(j=0;j<ftf->glyph->bitmap.width*ftf->glyph->bitmap.rows;j++){
buf[j*4 ]=fontColor[0];
buf[j*4+1]=fontColor[1];
buf[j*4+2]=fontColor[2];
- buf[j*4+3]=ftf->glyph->bitmap.buffer[j];
+ buf[j*4+3]=ftf->glyph->bitmap.buffer[j] ? 255 : 0;
}
ftexwh[i-33].x=ftf->glyph->bitmap.width;
@@ -631,7 +631,7 @@ namespace ui {
for(auto &c : player->qh.current){
hub.y -= fontSize * 1.15;
- putString(hub.x,hub.y,c->title);
+ putString(hub.x,hub.y,c.title.c_str());
}
}
}
@@ -765,7 +765,9 @@ namespace ui {
offset.x+m.button.loc.x + m.button.dim.x,
offset.y+m.button.loc.y + m.button.dim.y);
//draw the button text
- putStringCentered(offset.x + m.button.loc.x + (m.button.dim.x/2), (offset.y + m.button.loc.y + (m.button.dim.y/2)) - ui::fontSize/2, m.button.text);
+ putStringCentered(offset.x + m.button.loc.x + (m.button.dim.x/2),
+ (offset.y + m.button.loc.y + (m.button.dim.y/2)) - ui::fontSize/2,
+ m.button.text);
//tests if the mouse is over the button
if(mouse.x >= offset.x+m.button.loc.x && mouse.x <= offset.x+m.button.loc.x + m.button.dim.x){
diff --git a/src/world.cpp b/src/world.cpp
index df0f0ac..7126095 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -1371,13 +1371,23 @@ void IndoorWorld::draw(Player *p){
extern bool inBattle;
+std::vector<World *> battleNest;
+std::vector<vec2> battleNestLoc;
+
Arena::Arena(World *leave,Player *p,Mob *m){
generate(800);
addMob(MS_DOOR,100,100);
+
inBattle = true;
- exit = leave;
- pxy = p->loc;
mmob = m;
+ //exit = leave;
+ //pxy = p->loc;
+
+ mob.push_back(m);
+ entity.push_back(m);
+
+ battleNest.push_back(leave);
+ battleNestLoc.push_back(p->loc);
star = new vec2[100];
memset(star,0,100 * sizeof(vec2));
@@ -1392,14 +1402,20 @@ Arena::~Arena(void){
}
World *Arena::exitArena(Player *p){
+ World *tmp;
if(p->loc.x + p->width / 2 > mob[0]->loc.x &&
p->loc.x + p->width / 2 < mob[0]->loc.x + HLINE * 12 ){
- inBattle = false;
+ tmp = battleNest.front();
+ battleNest.erase(battleNest.begin());
+
+ inBattle = !battleNest.empty();
ui::toggleBlackFast();
ui::waitForCover();
- p->loc = pxy;
- mmob->alive = false;
- return exit;
+
+ p->loc = battleNestLoc.back();
+ battleNestLoc.pop_back();
+ //mmob->alive = false;
+ return tmp;
}else{
return this;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-06 23:01:40 +0000