Diff: actions.cpp

Revision:

15:05592aaa468c

Parent:

14:7225da81314a

Child:

16:06a88c0110ff

diff -r 7225da81314a -r 05592aaa468c actions.cpp
--- a/actions.cpp	Fri Dec 03 08:45:49 2021 +0000
+++ b/actions.cpp	Fri Dec 03 09:50:47 2021 +0000
@@ -6,7 +6,7 @@
 
 
 MapItem*spot = (MapItem*) malloc(sizeof(MapItem));
-int currentMap = get_map(1);
+int currentMap = get_map(0);
 
 
 int door_open()
@@ -50,39 +50,33 @@
     horizontal_speech1(line1,line2);
 }
 
-int  walkYpos;
+
+int  walkXpos;
+
+int npc_x = 10;
+int npc_y = 5;
 
 
-int gob_x = 18;
-int gob_y = 19;
-
-void walk_goblin(int slain)
+void walk_npc()
 {
 
-    if(slain != 1 && currentMap == 1) {
-        map_erase(gob_x,gob_y);
+   if(currentMap == 0 && npc_x != 6){
+        map_erase(npc_x,npc_y);
 
 
-        if ( gob_y == 18 ) {
-            walkYpos = 0;
-        } else if ( gob_y == 19) {
-            walkYpos = 1;
+        if ( npc_y == 5){
+            walkXpos = 1;
+            }
+        if ( walkXpos == 1){
+            npc_x--;
+            add_npc(npc_x,npc_y);
+            }
+        
+        
             }
 
-        if ( walkYpos == 1) {
-            gob_y--;
-            add_goblin(gob_x,gob_y,ENEMY1);
-        } else if ( walkYpos == 0) {
-            gob_y++;
-            add_goblin(gob_x,gob_y,ENEMY1);
-        
-    }
-    }
-    else if(slain == 1){
-        map_delete(gob_x,gob_y);
-        }
+}
 
-}
 
 void no_fruit()
 {
@@ -122,6 +116,13 @@
     horizontal_speech1(line1,line2);
 }
 
+void drg()
+{
+    char line1[] = "Dragon Damaged";
+    char line2[] = "DHP: -25";
+    horizontal_speech2(line1,line2);
+}
+
 void frt()
 {
     char line1[] = "HP:";