aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Quest.cpp22
-rw-r--r--src/Texture.cpp2
-rw-r--r--src/common.cpp8
-rw-r--r--src/config.cpp10
-rw-r--r--src/entities.cpp4
-rw-r--r--src/gameplay.cpp14
-rw-r--r--src/inventory.cpp40
-rw-r--r--src/threadpool.cpp2
-rw-r--r--src/ui.cpp2
-rw-r--r--src/world.cpp12
10 files changed, 67 insertions, 49 deletions
diff --git a/src/Quest.cpp b/src/Quest.cpp
index 8f3c33b..781b164 100644
--- a/src/Quest.cpp
+++ b/src/Quest.cpp
@@ -1,14 +1,14 @@
#include <algorithm>
-#include <Quest.h>
-#include <entities.h>
+#include <Quest.hpp>
+#include <entities.hpp>
extern Player *player;
int QuestHandler::assign(std::string title,std::string desc,std::string req){
Quest tmp;
char *tok;
-
+
tmp.title = title;
tmp.desc = desc;
@@ -17,17 +17,17 @@ int QuestHandler::assign(std::string title,std::string desc,std::string req){
strcpy(buf.get(),req.c_str());
tok = strtok(buf.get(),"\n\r\t,");
tmp.need.push_back({"\0",0});
-
+
while(tok){
if(tmp.need.back().name != "\0"){
tmp.need.back().n = atoi(tok);
tmp.need.push_back({"\0",0});
}else
tmp.need.back().name = tok;
-
+
tok = strtok(NULL,"\n\r\t,");
}
-
+
tmp.need.pop_back();
current.push_back(tmp);
@@ -39,7 +39,7 @@ int QuestHandler::drop(std::string title){
current.end(),
[&](Quest q){ return q.title == title; }),
current.end() );
-
+
return 0;
}
@@ -50,15 +50,15 @@ int QuestHandler::finish(std::string t){
if ( player->inv->hasItem( n.name ) < n.n )
return 0;
}
-
+
for ( auto &n : (*c).need )
player->inv->takeItem( n.name, n.n );
-
+
current.erase( c );
return 1;
}
}
-
+
return 0;
}
@@ -67,6 +67,6 @@ bool QuestHandler::hasQuest(std::string t){
if ( c.title == t )
return true;
}
-
+
return false;
}
diff --git a/src/Texture.cpp b/src/Texture.cpp
index 1ae5567..24dbb6a 100644
--- a/src/Texture.cpp
+++ b/src/Texture.cpp
@@ -1,7 +1,7 @@
#include <algorithm>
#include <string>
-#include <Texture.h>
+#include <Texture.hpp>
/**
* A structure for keeping track of loaded textures.
diff --git a/src/common.cpp b/src/common.cpp
index 1c9c2b5..10ff64e 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -9,7 +9,7 @@
# include <vector>
#endif // __WIN32__
-#include <common.h>
+#include <common.hpp>
#ifndef __WIN32__
@@ -80,18 +80,18 @@ const char *readFile(const char *path){
std::ifstream in (path,std::ios::in);
unsigned int size;
GLchar *buf;
-
+
if(!in.is_open()){
std::cout<<"Error reading file "<<path<<"!"<<std::endl;
abort();
}
-
+
in.seekg(0,in.end);
buf = new GLchar[(size = in.tellg()) + 1];
in.seekg(0,in.beg);
in.read(buf,size);
buf[size] = '\0';
-
+
in.close();
return buf;
}
diff --git a/src/config.cpp b/src/config.cpp
index 45bab3f..5f297b7 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -1,6 +1,6 @@
-#include <config.h>
+#include <config.hpp>
-#include <ui.h>
+#include <ui.hpp>
using namespace tinyxml2;
@@ -24,7 +24,7 @@ void readConfig(){
xml.LoadFile("config/settings.xml");
scr = xml.FirstChildElement("screen");
-
+
if(scr->QueryUnsignedAttribute("width",&uval) == XML_NO_ERROR)
SCREEN_WIDTH = uval;
else SCREEN_WIDTH = 1280;
@@ -39,7 +39,7 @@ void readConfig(){
else HLINE = 3;
vol = xml.FirstChildElement("volume");
-
+
if(vol->FirstChildElement("master")->QueryFloatAttribute("volume",&fval) == XML_NO_ERROR)
VOLUME_MASTER = fval;
else VOLUME_MASTER = 50;
@@ -49,7 +49,7 @@ void readConfig(){
if(vol->FirstChildElement("sfx")->QueryFloatAttribute("volume",&fval) == XML_NO_ERROR)
VOLUME_SFX = fval;
else VOLUME_SFX = 50;
-
+
ui::initFonts();
ui::setFontFace(xml.FirstChildElement("font")->Attribute("path"));
updateConfig();
diff --git a/src/entities.cpp b/src/entities.cpp
index 5a92c48..6476755 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -1,7 +1,7 @@
#include <istream>
-#include <entities.h>
-#include <ui.h>
+#include <entities.hpp>
+#include <ui.hpp>
extern std::istream *names;
diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index 075aec3..f398ca0 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -1,7 +1,7 @@
-#include <common.h>
-#include <entities.h>
-#include <world.h>
-#include <ui.h>
+#include <common.hpp>
+#include <entities.hpp>
+#include <world.hpp>
+#include <ui.hpp>
#include <tinyxml2.h>
using namespace tinyxml2;
@@ -212,13 +212,13 @@ CONT:
void commonPageFunc( Mob *callee )
{
static bool lock = false;
-
+
if ( !lock ) {
lock = true;
-
+
ui::drawPage( callee->heyid );
ui::waitForDialog();
-
+
callee->alive = false;
lock = false;
}
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 7ba5909..7317179 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -1,6 +1,6 @@
-#include <inventory.h>
-#include <entities.h>
-#include <ui.h>
+#include <inventory.hpp>
+#include <entities.hpp>
+#include <ui.hpp>
#include <tinyxml2.h>
using namespace tinyxml2;
@@ -190,7 +190,6 @@ void Inventory::setSelectionDown(){
void Inventory::draw(void){
static unsigned int lop = 0;
- //const unsigned int numSlot = 7;
static std::vector<int>dfp(numSlot);
static std::vector<Ray>iray(numSlot);
static std::vector<vec2>curCoord(numSlot);
@@ -314,6 +313,28 @@ void Inventory::draw(void){
glVertex2i(mr.x-(itemWide/2)+itemWide,mr.y-(itemWide/2)+itemWide);
glVertex2i(mr.x-(itemWide/2), mr.y-(itemWide/2)+itemWide);
glEnd();
+ if(!items.empty() && a < items.size() && items[a+numSlot].count){
+ glEnable(GL_TEXTURE_2D);
+ glBindTexture(GL_TEXTURE_2D, itemtex[items[a+numSlot].id]);
+ glColor4f(1.0f, 1.0f, 1.0f, ((float)massDfp[a]/(float)(massRange?massRange:1))*0.8f);
+ glBegin(GL_QUADS);
+ if(itemMap[items[a].id]->height > itemMap[items[a+numSlot].id]->width){
+ glTexCoord2i(0,1);glVertex2i(mr.x-((itemWide/2)*((float)itemMap[items[a+numSlot].id]->width/(float)itemMap[items[a+numSlot].id]->height)), mr.y-(itemWide/2));
+ glTexCoord2i(1,1);glVertex2i(mr.x+((itemWide/2)*((float)itemMap[items[a+numSlot].id]->width/(float)itemMap[items[a+numSlot].id]->height)), mr.y-(itemWide/2));
+ glTexCoord2i(1,0);glVertex2i(mr.x+((itemWide/2)*((float)itemMap[items[a+numSlot].id]->width/(float)itemMap[items[a+numSlot].id]->height)), mr.y+(itemWide/2));
+ glTexCoord2i(0,0);glVertex2i(mr.x-((itemWide/2)*((float)itemMap[items[a+numSlot].id]->width/(float)itemMap[items[a+numSlot].id]->height)), mr.y+(itemWide/2));
+ }else{
+ glTexCoord2i(0,1);glVertex2i(mr.x-(itemWide/2),mr.y-(itemWide/2)*((float)itemMap[items[a+numSlot].id]->height/(float)itemMap[items[a+numSlot].id]->width));
+ glTexCoord2i(1,1);glVertex2i(mr.x+(itemWide/2),mr.y-(itemWide/2)*((float)itemMap[items[a+numSlot].id]->height/(float)itemMap[items[a+numSlot].id]->width));
+ glTexCoord2i(1,0);glVertex2i(mr.x+(itemWide/2),mr.y+(itemWide/2)*((float)itemMap[items[a+numSlot].id]->height/(float)itemMap[items[a+numSlot].id]->width));
+ glTexCoord2i(0,0);glVertex2i(mr.x-(itemWide/2),mr.y+(itemWide/2)*((float)itemMap[items[a+numSlot].id]->height/(float)itemMap[items[a+numSlot].id]->width));
+ }
+ glEnd();
+ glDisable(GL_TEXTURE_2D);
+ ui::setFontColor(255,255,255,((float)massDfp[a]/(float)(massRange?massRange:1))*255);
+ ui::putText(mr.x-(itemWide/2)+(itemWide*.85),mr.y-(itemWide/2),"%d",items[a+numSlot].count);
+ ui::setFontColor(255,255,255,255);
+ }
a++;
}a=0;
@@ -364,14 +385,16 @@ void Inventory::draw(void){
}
glEnd();
glDisable(GL_TEXTURE_2D);
- ui::putText(r.end.x-(itemWide/2),r.end.y-(itemWide*.9),"%s",itemMap[items[a].id]->name.c_str());
+ ui::setFontColor(255,255,255,((float)dfp[a]/(float)(range?range:1))*255);
+ ui::putStringCentered(r.end.x,r.end.y-(itemWide*.9),itemMap[items[a].id]->name.c_str());
ui::putText(r.end.x-(itemWide/2)+(itemWide*.85),r.end.y-(itemWide/2),"%d",items[a].count);
+ ui::setFontColor(255,255,255,255);
}
if(sel == a){
static float sc = 1;
static bool up;
- up ? sc += .01 : sc -= .01;
+ up ? sc += .0005*deltaTime : sc -= .0005*deltaTime;
if(sc > 1.2){
up = false;
sc = 1.2;
@@ -380,10 +403,6 @@ void Inventory::draw(void){
up = true;
sc = 1.0;
}
- glPushMatrix();
- glLoadIdentity();
- //glTranslatef(-sc, -sc, 0);
- //glScalef(sc,sc,0.0f);
glBegin(GL_QUADS);
glColor4f(1.0f, 1.0f, 1.0f, ((float)dfp[a]/(float)(range?range:1)));
glVertex2f(r.end.x - (itemWide*sc)/2 - (itemWide*sc)*.09,r.end.y - (itemWide*sc)/2 - (itemWide*sc)*.09);
@@ -406,7 +425,6 @@ void Inventory::draw(void){
glVertex2f(r.end.x + (itemWide*sc)/2 + (itemWide*sc)*.09,r.end.y + (itemWide*sc)/2 + (itemWide*sc)*.09);
glVertex2f(r.end.x + (itemWide*sc)/2 ,r.end.y + (itemWide*sc)/2 + (itemWide*sc)*.09);
glEnd();
- glPopMatrix();
}
a++;
}
diff --git a/src/threadpool.cpp b/src/threadpool.cpp
index 619f002..c4f1c4a 100644
--- a/src/threadpool.cpp
+++ b/src/threadpool.cpp
@@ -1,4 +1,4 @@
-#include "threadpool.h"
+#include <threadpool.hpp>
/**
* Stolen from some guy.
diff --git a/src/ui.cpp b/src/ui.cpp
index c646458..9b82b5d 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -1,4 +1,4 @@
-#include <ui.h>
+#include <ui.hpp>
/*
* Create a macro to easily access SDL keypresses
diff --git a/src/world.cpp b/src/world.cpp
index d8fd2d3..54ff921 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -1,8 +1,8 @@
#include <algorithm>
#include <sstream>
-#include <world.h>
-#include <ui.h>
+#include <world.hpp>
+#include <ui.hpp>
#include <tinyxml2.h>
using namespace tinyxml2;
@@ -433,10 +433,10 @@ void World::draw(Player *p){
safeSetColorA( 255, 255, 255, weather == WorldWeather::Snowy ? 150 : 255 - worldShade * 4);
glBegin( GL_QUADS );
- glTexCoord2i( 0, 0 ); glVertex2i( worldStart, SCREEN_HEIGHT );
- glTexCoord2i( 1, 0 ); glVertex2i( -worldStart, SCREEN_HEIGHT );
- glTexCoord2i( 1, 1 ); glVertex2i( -worldStart, 0 );
- glTexCoord2i( 0, 1 ); glVertex2i( worldStart, 0 );
+ glTexCoord2i( 0, 0 ); glVertex2i( offset.x - SCREEN_WIDTH/2, SCREEN_HEIGHT );
+ glTexCoord2i( 1, 0 ); glVertex2i( offset.x + SCREEN_WIDTH/2, SCREEN_HEIGHT );
+ glTexCoord2i( 1, 1 ); glVertex2i( offset.x + SCREEN_WIDTH/2, 0 );
+ glTexCoord2i( 0, 1 ); glVertex2i( offset.x - SCREEN_WIDTH/2, 0 );
glEnd();
bgTex->bindNext();
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-06 23:01:30 +0000