diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.cpp | 1 | ||||
| -rw-r--r-- | src/entities.cpp | 51 | ||||
| -rw-r--r-- | src/gameplay.cpp | 3 | ||||
| -rw-r--r-- | src/threadpool.cpp | 95 | ||||
| -rw-r--r-- | src/ui.cpp | 159 | ||||
| -rw-r--r-- | src/world.cpp | 53 |
6 files changed, 340 insertions, 22 deletions
diff --git a/src/config.cpp b/src/config.cpp index 72a071d..45bab3f 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -56,6 +56,7 @@ void readConfig(){ } void updateConfig(){ + Mix_Volume(0,VOLUME_MASTER); Mix_Volume(1,VOLUME_SFX * (VOLUME_MASTER/100.0f)); Mix_VolumeMusic(VOLUME_MUSIC * (VOLUME_MASTER/100.0f)); diff --git a/src/entities.cpp b/src/entities.cpp index 6c2da81..5e8d51c 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -3,7 +3,7 @@ #include <istream> -#define RAND_DIALOG_COUNT 13 +#define RAND_DIALOG_COUNT 14 extern std::istream *names; extern unsigned int loops; @@ -125,6 +125,7 @@ NPC::NPC(){ //sets all of the NPC specific traits on object creation randDialog = rand() % RAND_DIALOG_COUNT - 1; dialogIndex = 0; } + NPC::~NPC(){ while(!aiFunc.empty()){ aiFunc.pop_back(); @@ -135,6 +136,36 @@ NPC::~NPC(){ delete[] name; } +Merchant::Merchant(){ //sets all of the Merchant specific traits on object creation + width = HLINE * 10; + height = HLINE * 16; + + type = MERCHT; //sets type to merchant + subtype = 0; + + health = maxHealth = 100; + + maxHealth = health = 100; + canMove = true; + + //tex = new Texturec(1,"assets/NPC.png"); + //inv = new Inventory(NPC_INV_SIZE); + //inv = new Inventory(1); + + //randDialog = rand() % RAND_DIALOG_COUNT - 1; + dialogIndex = 0; +} + +Merchant::~Merchant(){ + /*while(!aiFunc.empty()){ + aiFunc.pop_back(); + }*/ + + //delete inv; + //delete tex; + //delete[] name; +} + Structures::Structures(){ //sets the structure type health = maxHealth = 1; @@ -143,7 +174,7 @@ Structures::Structures(){ //sets the structure type name = NULL; - inv = NULL; + //inv = NULL; canMove = false; } Structures::~Structures(){ @@ -401,7 +432,8 @@ const char *randomDialog[RAND_DIALOG_COUNT] = { "I want to have the wallpaper in our house changed. It doesn\'t really fit the environment.", "Frig.", "The sine of theta equals the opposite over the hypotenuese.", - "Did you know the developers spelt brazier as brazzier." + "Did you know the developers spelt brazier as brazzier.", + "My dad once said to me, \"Boy, you are in a game.\" I never knew what he meant by that." }; void NPC::interact(){ //have the npc's interact back to the player @@ -425,6 +457,12 @@ void NPC::interact(){ //have the npc's interact back to the player canMove=true; } +void Merchant::interact(){ + ui::merchantBox(name, &bsinv, ":Accept:Good-Bye", false, "Welcome to Smithy\'s. Buy your sausages here you freaking meme lording screw-face"); + //ui::merchantBox(); + ui::waitForDialog(); +} + void Object::interact(void){ if(questObject && alive){ ui::dialogBox(player->name,":Yes:No",false,pickupDialog); @@ -468,11 +506,18 @@ unsigned int Structures::spawn(BUILD_SUB sub, float x, float y){ //unsigned int tempN = (getRand() % 5 + 2); switch(sub){ + case STALL_MARKET: + tex = new Texturec(1, textureLoc ? textureLoc : inWorld->sTexLoc[sub].c_str()); + dim = Texture::imageDim(textureLoc ? textureLoc : inWorld->sTexLoc[sub].c_str()); + width = dim.x; + height = dim.y; + break; default: tex = new Texturec(1, textureLoc ? textureLoc : inWorld->sTexLoc[sub].c_str()); dim = Texture::imageDim(textureLoc ? textureLoc : inWorld->sTexLoc[sub].c_str()); width = dim.x; height = dim.y; + inv = NULL; break; } return 0; diff --git a/src/gameplay.cpp b/src/gameplay.cpp index 4bbc672..1c77309 100644 --- a/src/gameplay.cpp +++ b/src/gameplay.cpp @@ -217,8 +217,7 @@ void commonTriggerFunc(Mob *callee){ XMLDocument xml; XMLElement *exml; - char *text,*pch; - + char *text,*pch; if(!lock){ lock = true; diff --git a/src/threadpool.cpp b/src/threadpool.cpp new file mode 100644 index 0000000..d49217d --- /dev/null +++ b/src/threadpool.cpp @@ -0,0 +1,95 @@ +#include "threadpool.h" + +// Constructor. +ThreadPool::ThreadPool(int threads) : + terminate(false), + stopped(false) +{ + // Create number of required threads and add them to the thread pool vector. + for(int i = 0; i < threads; i++) + { + threadPool.emplace_back(thread(&ThreadPool::Invoke, this)); + } +} + +void ThreadPool::Enqueue(function<void()> f) +{ + // Scope based locking. + { + // Put unique lock on task mutex. + unique_lock<mutex> lock(tasksMutex); + + // Push task into queue. + tasks.push(f); + } + + // Wake up one thread. + condition.notify_one(); +} + +void ThreadPool::Invoke() { + + function<void()> task; + while(true) + { + // Scope based locking. + { + // Put unique lock on task mutex. + unique_lock<mutex> lock(tasksMutex); + + // Wait until queue is not empty or termination signal is sent. + condition.wait(lock, [this]{ return !tasks.empty() || terminate; }); + + // If termination signal received and queue is empty then exit else continue clearing the queue. + if (terminate && tasks.empty()) + { + return; + } + + // Get next task in the queue. + task = tasks.front(); + + // Remove it from the queue. + tasks.pop(); + } + + // Execute the task. + task(); + } +} + +void ThreadPool::ShutDown() +{ + // Scope based locking. + { + // Put unique lock on task mutex. + unique_lock<mutex> lock(tasksMutex); + + // Set termination flag to true. + terminate = true; + } + + // Wake up all threads. + condition.notify_all(); + + // Join all threads. + for(thread &thread : threadPool) + { + thread.join(); + } + + // Empty workers vector. + threadPool.empty(); + + // Indicate that the pool has been shut down. + stopped = true; +} + +// Destructor. +ThreadPool::~ThreadPool() +{ + if (!stopped) + { + ShutDown(); + } +}
\ No newline at end of file @@ -47,10 +47,10 @@ static unsigned char fontColor[3] = {255,255,255}; static char dialogBoxText[512]; static char *dialogOptText[4]; +static float merchAOptLoc[2][3]; static float dialogOptLoc[4][3]; static unsigned char dialogOptCount = 0; static bool typeOutDone = true; -static int dialogPassiveTime = 0; /* * Menu-related objects @@ -140,6 +140,9 @@ namespace ui { */ bool dialogPassive = false; + bool dialogMerchant = false; + std::vector<BuySell> *minv; + int dialogPassiveTime = 0; /** * When set to true the dialog box will attempt to display. @@ -237,6 +240,7 @@ namespace ui { */ void setFontSize(unsigned int size){ + mtx.lock(); unsigned int i,j; std::unique_ptr<uint8_t[]> rgbaBuf; @@ -298,6 +302,7 @@ namespace ui { rgbaBuf.release(); } + mtx.unlock(); } /** @@ -515,6 +520,7 @@ namespace ui { */ void dialogBox(const char *name,const char *opt,bool passive,const char *text,...){ + textWrapLimit = 110; va_list dialogArgs; size_t len; @@ -544,14 +550,20 @@ namespace ui { dialogOptChosen = 0; memset(&dialogOptLoc, 0, sizeof(float) * 12); + //char *sopt = (char*)malloc(255); + //dialogOptCount = 4; // handle options if desired if(opt){ - std::unique_ptr<char[]> soptbuf (new char[strlen(opt) + 1]); - char *sopt = strtok(soptbuf.get(), ":"); + //std::vector<char*> soptbuf (new char[strlen(opt) + 1]); + //std::unique_ptr<char[]> soptbuf (new char[strlen(opt) + 1]); + char soptbuf[255]; + strcpy(soptbuf, opt); + char *sopt = strtok(soptbuf, ":"); // cycle through options while(sopt){ + printf("%s",sopt); strcpy( (dialogOptText[dialogOptCount++] = new char[strlen(sopt) + 1]), sopt); sopt = strtok(NULL,":"); } @@ -565,6 +577,69 @@ namespace ui { if(typeOutStr) *typeOutStr = '\0'; } + + void merchantBox(const char *name,std::vector<BuySell> *bsinv,const char *opt,bool passive,const char *text,...){ + std::cout << "Buying and selling on the bi-weekly!" << std::endl; + va_list dialogArgs; + size_t len; + + minv = bsinv; + dialogPassive = passive; + + // clear the buffer + memset(dialogBoxText, '\0', 512); + + // create the string + strcpy(dialogBoxText, name); + strcat(dialogBoxText, ": "); + + len=strlen(dialogBoxText); + va_start(dialogArgs,text); + vsnprintf(dialogBoxText + len, 512 - len, text, dialogArgs); + va_end(dialogArgs); + + // free old option text + while(dialogOptCount){ + if(dialogOptText[dialogOptCount]){ + delete[] dialogOptText[dialogOptCount]; + dialogOptText[dialogOptCount] = NULL; + } + + dialogOptCount--; + }; + + dialogOptChosen = 0; + memset(&dialogOptLoc, 0, sizeof(float) * 12); + + // handle options if desired + if(opt){ + //std::unique_ptr<char[]> soptbuf (new char[strlen(opt) + 1]); + char soptbuf[255]; + strcpy(soptbuf, opt); + char *sopt = strtok(soptbuf, ":"); + + // cycle through options + while(sopt){ + strcpy( (dialogOptText[dialogOptCount++] = new char[strlen(sopt) + 1]), sopt); + sopt = strtok(NULL,":"); + } + } + + // allow box to be displayed + dialogBoxExists = true; + dialogImportant = false; + dialogMerchant = true; + textWrapLimit = 50; + + // kill the string created by typeOut if it contains something + if(typeOutStr) + *typeOutStr = '\0'; + } + + void merchantBox(){ + textWrapLimit = 50; + dialogMerchant = true; + } /** * Wait for a dialog box to be dismissed. @@ -663,10 +738,65 @@ namespace ui { putStringCentered(offset.x, offset.y, rtext); setFontSize(16); } - }else{ // normal dialog box - x = offset.x - SCREEN_WIDTH / 2 + HLINE * 8; - y = (offset.y + SCREEN_HEIGHT / 2) - HLINE * 8; + }else if(dialogMerchant){ + x=offset.x-SCREEN_WIDTH/6; + y=(offset.y+SCREEN_HEIGHT/2)-HLINE*8; + + + glColor3ub(255,255,255); + glBegin(GL_LINE_STRIP); + glVertex2f(x-1 ,y+1); + glVertex2f(x+1+(SCREEN_WIDTH/3),y+1); + glVertex2f(x+1+(SCREEN_WIDTH/3),y-1-SCREEN_HEIGHT*.6); + glVertex2f(x-1,y-1-SCREEN_HEIGHT*.6); + glVertex2f(x,y+1); + glEnd(); + glColor3ub(0,0,0); + glRectf(x,y,x+SCREEN_WIDTH/3,y-SCREEN_HEIGHT*.6); + + // draw typeOut'd text + putString(x + HLINE, y - fontSize - HLINE, (rtext = typeOut(dialogBoxText))); + merchAOptLoc[0][0] = offset.x - (SCREEN_WIDTH / 5.5); + merchAOptLoc[0][1] = offset.x + (SCREEN_WIDTH / 5.5); + merchAOptLoc[1][0] = offset.y + (SCREEN_HEIGHT *.25); + merchAOptLoc[1][1] = offset.y + (SCREEN_HEIGHT *.25); + merchAOptLoc[2][0] = offset.x - (SCREEN_WIDTH / 5.5) - 16; + merchAOptLoc[2][1] = offset.x + (SCREEN_WIDTH / 5.5) + 16; + + glColor3ub(255,255,255); + glBegin(GL_TRIANGLES); + glVertex2f(merchAOptLoc[2][0],merchAOptLoc[1][0]); + glVertex2f(merchAOptLoc[0][0],merchAOptLoc[1][0]-8); + glVertex2f(merchAOptLoc[0][0],merchAOptLoc[1][0]+8); + glEnd(); + + // draw / handle dialog options if they exist + for(i = 0; i < dialogOptCount; i++){ + setFontColor(255, 255, 255); + + // draw option + tmp = putStringCentered(offset.x, dialogOptLoc[i][1], dialogOptText[i]); + + // get coordinate information on option + dialogOptLoc[i][2] = offset.x + tmp; + dialogOptLoc[i][0] = offset.x - tmp; + dialogOptLoc[i][1] = y - SCREEN_HEIGHT / 2 - (fontSize + HLINE) * (i + 1); + + // make text yellow if the mouse hovers over the text + if(mouse.x > dialogOptLoc[i][0] && mouse.x < dialogOptLoc[i][2] && + mouse.y > dialogOptLoc[i][1] && mouse.y < dialogOptLoc[i][1] + 16 ){ + setFontColor(255, 255, 0); + putStringCentered(offset.x, dialogOptLoc[i][1], dialogOptText[i]); + } + } + + setFontColor(255, 255, 255); + }else{ //normal dialog box + + x=offset.x-SCREEN_WIDTH/2+HLINE*8; + y=(offset.y+SCREEN_HEIGHT/2)-HLINE*8; + // draw white border glColor3ub(255, 255, 255); glBegin(GL_LINE_STRIP); @@ -1123,6 +1253,11 @@ namespace ui { break; } } + + if(dialogMerchant){ + for(i = 0; i < 2; i++){ + } + } // handle important text if(dialogImportant){ @@ -1130,10 +1265,10 @@ namespace ui { setFontSize(16); } - // kill the dialog box + if(dialogMerchant) dialogMerchant = false; dialogBoxExists = false; } - + void handleEvents(void){ static bool left=true,right=false; static int heyOhLetsGo = 0; @@ -1364,10 +1499,10 @@ namespace ui { pixels = new GLubyte[ 3 * SCREEN_WIDTH * SCREEN_HEIGHT]; glReadPixels(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, GL_RGB, GL_UNSIGNED_BYTE, pixels); - static std::thread scr; - scr = std::thread(takeScreenshot,pixels); - scr.detach(); - //takeScreenshot(pixels); + //static std::thread scr; + //scr = std::thread(takeScreenshot,pixels); + //scr.detach(); + takeScreenshot(pixels); std::cout << "Took screenshot" << std::endl; break; diff --git a/src/world.cpp b/src/world.cpp index 303d53b..9e891fb 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -118,6 +118,9 @@ void World::deleteEntities(void){ delete mob.back(); mob.pop_back(); } + while(!merchant.empty()){ + merchant.pop_back(); + } while(!npc.empty()){ delete npc.back(); npc.pop_back(); @@ -140,6 +143,10 @@ void World::deleteEntities(void){ while(!light.empty()){ light.pop_back(); } + while(!village.empty()){ + delete village.back(); + village.pop_back(); + } } World::~World(void){ @@ -945,7 +952,8 @@ void World::detect(Player *p){ */ //auto pl = std::async(&World::singleDetect,this,p); - std::thread(&World::singleDetect,this, p).detach(); + //std::thread(&World::singleDetect,this, p).detach(); + singleDetect(p); /* * Handle all remaining entities in this world. @@ -953,8 +961,8 @@ void World::detect(Player *p){ //LOOOOP: for(auto &e : entity) - std::thread(&World::singleDetect,this,e).detach(); - //hey->singleDetect(e); + //std::thread(&World::singleDetect,this,e).detach(); + singleDetect(e); for(auto &part : particles){ int l; unsigned int i; @@ -1070,6 +1078,14 @@ void World::addNPC(float x,float y){ entity.push_back(npc.back()); } +void World::addMerchant(float x, float y){ + merchant.push_back(new Merchant()); + merchant.back()->spawn(x,y); + + npc.push_back(merchant.back()); + entity.push_back(npc.back()); +} + void World::addObject(/*ITEM_ID i*/std::string in,const char *p, float x, float y){ object.push_back(new Object(in,p)); object.back()->spawn(x,y); @@ -1532,14 +1548,15 @@ World *loadWorldFromXMLNoSave(const char *path){ xml.LoadFile(currentXML); wxml = xml.FirstChildElement("World"); - vil = xml.FirstChildElement("World")->FirstChildElement("village"); if(wxml){ wxml = wxml->FirstChildElement(); + vil = xml.FirstChildElement("World")->FirstChildElement("village"); Indoor = false; tmp = new World(); }else if((wxml = xml.FirstChildElement("IndoorWorld"))){ wxml = wxml->FirstChildElement(); + vil = NULL; Indoor = true; tmp = new IndoorWorld(); } @@ -1639,8 +1656,34 @@ World *loadWorldFromXMLNoSave(const char *path){ (char*)vil->Attribute("texture"), ptr); - vptr->build.push_back(tmp->build.back()); + }else if(!strcmp(name, "stall")){ + if(!strcmp(vil->Attribute("type"),"market")){ + std::cout << "Market" << std::endl; + tmp->addStructure((BUILD_SUB)70, + vil->QueryFloatAttribute("x", &spawnx) != XML_NO_ERROR ? + randx : spawnx, + 100, + (char*)vil->Attribute("texture"), + ptr); + tmp->addMerchant(0,100); + if(!strcmp(name,"buy")){ + std::cout << "Buying"; + }else if(!strcmp(name,"sell")){ + std::cout << "Selling"; + } + strcpy(tmp->merchant.back()->name,"meme"); + + }else if(!strcmp(vil->Attribute("type"),"trader")){ + std::cout << "Trader" << std::endl; + tmp->addStructure((BUILD_SUB)71, + vil->QueryFloatAttribute("x", &spawnx) != XML_NO_ERROR ? + randx : spawnx, + 100, + (char*)vil->Attribute("texture"), + ptr); + } } + vptr->build.push_back(tmp->build.back()); if(vptr->build.back()->loc.x < vptr->start.x){ vptr->start.x = vptr->build.back()->loc.x; } |