diff options
Diffstat (limited to 'src/gameplay.cpp')
| -rw-r--r-- | src/gameplay.cpp | 134 |
1 files changed, 72 insertions, 62 deletions
diff --git a/src/gameplay.cpp b/src/gameplay.cpp index 2fd7424..b7eab72 100644 --- a/src/gameplay.cpp +++ b/src/gameplay.cpp @@ -5,42 +5,6 @@ extern World *currentWorld; extern Player *player; -extern void mainLoop(void); -extern SDL_Window *window; -extern bool fadeEnable; - -void story(void){ - for(int i=0;i<600;i++){ - glMatrixMode(GL_PROJECTION); - glPushMatrix(); - glLoadIdentity(); - glOrtho((offset.x-SCREEN_WIDTH/2),(offset.x+SCREEN_WIDTH/2),offset.y-SCREEN_HEIGHT/2,offset.y+SCREEN_HEIGHT/2,-1,1); - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); - glLoadIdentity(); - glEnable(GL_STENCIL_TEST); - glPushMatrix(); - - glPushAttrib( GL_DEPTH_BUFFER_BIT | GL_LIGHTING_BIT ); - glClear(GL_COLOR_BUFFER_BIT); - - glColor4f(0.0f,0.0f,0.0f,0.0f); - glRectf(-SCREEN_WIDTH/2,0,SCREEN_WIDTH/2,SCREEN_HEIGHT); - glColor4f(1.0f,1.0f,1.0f,1.0f); - ui::importantText("Oh hello, where are you?"); - //ui::setFontSize(16); - //ui::putText(54,540,"BITC."); - - glPopMatrix(); - SDL_GL_SwapWindow(window); - } -} - -void waitForDialog(void){ - do{ - mainLoop(); - }while(ui::dialogBoxExists); -} int compTestQuest(NPC *speaker){ ui::dialogBox(speaker->name,NULL,"Ooo, that's a nice quest you got there. Lemme finish that for you ;)."); @@ -51,16 +15,13 @@ int compTestQuest(NPC *speaker){ int giveTestQuest(NPC *speaker){ unsigned char i; - char opt[]=":Yes:No"; - ui::dialogBox(speaker->name,opt,"Here, have a quest!"); - - waitForDialog(); + ui::dialogBox(speaker->name,":Yes:No","Here, have a quest!"); + ui::waitForDialog(); if(ui::dialogOptChosen == 1){ ui::dialogBox(speaker->name,NULL,"Have a good day! :)"); - - waitForDialog(); + ui::waitForDialog(); player->qh.assign("Test"); currentWorld->npc[1]->addAIFunc(compTestQuest,true); @@ -73,14 +34,12 @@ int giveTestQuest(NPC *speaker){ static Arena *a; void CUTSCENEEE(void){ - char opt[]=":K."; player->vel.x = 0; - ui::dialogBox(player->name,opt,"No way I\'m gettin\' up this hill."); - waitForDialog(); + ui::dialogBox(player->name,":K.","No way I\'m gettin\' up this hill."); + ui::waitForDialog(); a = new Arena(currentWorld,player); - currentWorld = a; /*player->right = true; @@ -91,6 +50,13 @@ void CUTSCENEEE(void){ float playerSpawnHillFunc(float x){ return (float)(pow(2,(-x+200)/5) + 80); } + +static World *test; +static World *playerSpawnHill; +static IndoorWorld *iw; + +void destroyEverything(void); + void initEverything(void){ unsigned int i; @@ -98,17 +64,18 @@ void initEverything(void){ * World creation: */ - World *test=new World(); - World *playerSpawnHill=new World(); + test=new World(); test->generate(SCREEN_WIDTH*2); - test->addHole(100,150); - test->setBackground(BG_FOREST); + + test->addHole(100,150); test->addLayer(400); - playerSpawnHill->generateFunc(1280,playerSpawnHillFunc); + playerSpawnHill=new World(); + playerSpawnHill->setBackground(BG_FOREST); + playerSpawnHill->generateFunc(1280,playerSpawnHillFunc); //playerSpawnHill->generate(1920); /* @@ -116,6 +83,7 @@ void initEverything(void){ */ currentWorld=playerSpawnHill; + playerSpawnHill->toRight=test; test->toLeft=playerSpawnHill; @@ -130,22 +98,21 @@ void initEverything(void){ * Create a structure (this will create villagers when spawned). */ - IndoorWorld *iw=new IndoorWorld(); + iw=new IndoorWorld(); iw->generate(200); - currentWorld->addStructure(STRUCTURET,(rand()%120*HLINE),10,test,iw); - /* - * Spawn some mobs. + * Spawn some entities. */ + playerSpawnHill->addStructure(STRUCTURET,(rand()%120*HLINE),10,test,iw); playerSpawnHill->addMob(MS_TRIGGER,-1300,0,CUTSCENEEE); + playerSpawnHill->addObject(SWORD_WOOD, false, "", 500,200); + playerSpawnHill->addObject(FLASHLIGHT, true, "This looks important, do you want to pick it up?",600,200); + test->addMob(MS_RABBIT,200,100); test->addMob(MS_BIRD,-500,500); - - currentWorld->addObject(SWORD_WOOD, false, "", 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); @@ -153,9 +120,52 @@ void initEverything(void){ 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. - */ - currentWorld->npc[0]->addAIFunc(giveTestQuest,false); + playerSpawnHill->npc[0]->addAIFunc(giveTestQuest,false); + + atexit(destroyEverything); +} + +extern std::vector<int (*)(NPC *)> AIpreload; +extern std::vector<NPC *> AIpreaddr; + +void destroyEverything(void){ + delete test; + delete playerSpawnHill; + + while(!AIpreload.empty()){ + AIpreload.pop_back(); + } + while(!AIpreaddr.empty()){ + AIpreaddr.pop_back(); + } + + //delete iw; // segfaults } + +/*void story(void){ + for(int i=0;i<600;i++){ + glMatrixMode(GL_PROJECTION); + glPushMatrix(); + glLoadIdentity(); + glOrtho((offset.x-SCREEN_WIDTH/2),(offset.x+SCREEN_WIDTH/2),offset.y-SCREEN_HEIGHT/2,offset.y+SCREEN_HEIGHT/2,-1,1); + glMatrixMode(GL_MODELVIEW); + glPushMatrix(); + glLoadIdentity(); + glEnable(GL_STENCIL_TEST); + glPushMatrix(); + + glPushAttrib( GL_DEPTH_BUFFER_BIT | GL_LIGHTING_BIT ); + glClear(GL_COLOR_BUFFER_BIT); + + glColor4f(0.0f,0.0f,0.0f,0.0f); + glRectf(-SCREEN_WIDTH/2,0,SCREEN_WIDTH/2,SCREEN_HEIGHT); + glColor4f(1.0f,1.0f,1.0f,1.0f); + ui::importantText("Oh hello, where are you?"); + //ui::setFontSize(16); + //ui::putText(54,540,"BITC."); + + glPopMatrix(); + SDL_GL_SwapWindow(window); + } +}*/ |