推箱子v0.0.3

修复了在某些情况下撤回出错的问题
修复了一些bug

Author: LanYunDev

README.md

@@ -16,7 +16,8 @@
 
 目前实现的功能有:
 
-1. 已实现在无限步数下的撤回操作~~基于链表的有限步数下的单次回滚(撤回)等操作 (通俗点说,就是不支持多次撤回,撤回的前一步不能是撤回步骤)~~
+1. 已实现在无限步数下的撤回操作
+   ~~基于链表的有限步数下的单次回滚(撤回)等操作 (通俗点说,就是不支持多次撤回,撤回的前一步不能是撤回步骤)~~
 2. 基于ncurses.h库而实现的窗口和方向键等功能 (本程序多次使用这个库里面的函数,建议了解并学习后使用它)
 3. 在玩过的关卡中可自由选择关卡
 4. 通过文件读写方式存数据和地图
@@ -45,7 +46,7 @@ gcc main.c -o PushBox -lncurses
 
 游戏🎮游玩示例GIF图:
 
-![2022-05-05 12.48.32](README/2022-05-05%2012.48.32.gif)
+![v0.0.3-2022-05-07 00.10.53](README/v0.0.3-2022-05-07%2000.10.53.gif)
 
 ## Todo
 

README/v0.0.3-2022-05-07 00.10.53.gif

@@ -1,3 +1,3 @@
-Start testing: May 06 23:13 CST
+Start testing: May 07 00:09 CST
 ----------------------------------------------------------
-End testing: May 06 23:13 CST
+End testing: May 07 00:09 CST

cmake-build-debug/Testing/Temporary/LastTest.log

@@ -0,0 +1,2 @@
+Top_Level:14
+Latest_Level:14

data.txt

@@ -475,7 +475,9 @@ void moveUp(Position *p) {
 
     //人上面是目的地
     if (map[uy][ux] == 4) {
-        map[y][x] = 0;
+        if (map[y][x] == 6) {
+            map[y][x] = 4;
+        } else map[y][x] = 0;
         map[uy][ux] = 6;
         //更新人的坐标
         y = uy;
@@ -547,7 +549,9 @@ void moveDown(Position *p) {
 
     //人下面是目的地
     if (map[uy][ux] == 4) {
-        map[y][x] = 0;
+        if (map[y][x] == 6) {
+            map[y][x] = 4;
+        } else map[y][x] = 0;
         map[uy][ux] = 6;
         //更新人的坐标
         y = uy;
@@ -620,7 +624,9 @@ void moveLeft(Position *p) {
 
     //人左面是目的地
     if (map[uy][ux] == 4) {
-        map[y][x] = 0;
+        if (map[y][x] == 6) {
+            map[y][x] = 4;
+        } else map[y][x] = 0;
         map[uy][ux] = 6;
         //更新人的坐标
         x = ux;
@@ -693,7 +699,9 @@ void moveRight(Position *p) {
 
     //人右面是目的地
     if (map[uy][ux] == 4) {
-        map[y][x] = 0;
+        if (map[y][x] == 6) {
+            map[y][x] = 4;
+        } else map[y][x] = 0;
         map[uy][ux] = 6;
         //更新人的坐标
         x = ux;
@@ -750,28 +758,33 @@ Position *moveBack(Position *head, Position *p) {
     int n = 0;//记录📝指针循环♻️次数
 
     while (tmp->next->next != NULL) {//移动指针到倒数第二个
-        tmp = tmp->next;
-        n++;
+        tmp = tmp->next;//链表tmp指向下一个节点
+        n++;//计数n增加一
     }
 
     //判断步数是否有两步以上，如果有就不进行撤回
     if (!n) {
-        free(del);
+        free(del);//释放指针del的内存
 
         check = 3;//不可再进行撤回标识
 
         return p;
     }
 
     del = tmp->next; //要删除的位置,即当前位置
-    tmp->next = NULL;
+    tmp->next = NULL;//删除tmp的下一个节点
     p = tmp; //要撤回到的位置
 
+    //如果有相同的坐标，直接删除一个。
+    if ((p->y == del->y) && (p->x == del->x)) {
+        free(del);//释放指针del的内存
+
+        check = 1;//可再进行撤回标识
+
+        return p;
+    }
+
     if ((p->box_x > 0) && (p->box_y > 0)) {   //如果人物移动前有箱子📦的话
-        //撤回人物和撤回箱子📦移动，（顺带覆盖掉了人物）
-//        if (map[del->y][del->x] == 6) {
-//            map[del->y][del->x] = 5;
-//        } else map[del->y][del->x] = 3;
         //撤回人物的移动。
         if (map[p->y][p->x] == 4) {//如果被撤回的位置是目的地
             map[p->y][p->x] = 6;//是，则修改人人在目的地
@@ -787,7 +800,7 @@ Position *moveBack(Position *head, Position *p) {
         else map[p->box_y + y_][p->box_x + x_] = 0;//如果不是，则修改为空
 
         //撤回箱子📦的移动
-        if (map[p->box_y][p->box_x] == 4)//判断箱子📦撤回到的位置是否为为目的地
+        if (map[p->box_y][p->box_x] == 4 || map[p->box_y][p->box_x] == 6)//判断箱子📦撤回到的位置是否为含有目的地
             map[p->box_y][p->box_x] = 5;//是，则将被撤回的位置修改为已完成✅的箱子📦
         else map[p->box_y][p->box_x] = 3;//如果不是，则修改为箱子📦
 
@@ -804,7 +817,7 @@ Position *moveBack(Position *head, Position *p) {
         } else map[del->y][del->x] = 0;//如果不是，则修改为空白
     }
 
-    free(del);
+    free(del);//释放指针del的内存
 
     check = 1;
 

main

@@ -0,0 +1,125 @@
+1 1 1 1 1 1 1 0
+1 0 0 3 0 4 1 0
+1 0 0 1 1 1 1 0
+1 0 2 1 0 0 0 0
+1 1 1 1 0 0 0 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+
+1 1 1 1 1 1 1 0
+1 0 0 2 0 0 1 0
+1 0 0 0 0 0 1 0
+1 0 0 0 3 4 1 0
+1 0 0 0 0 0 1 0
+1 1 1 1 1 1 1 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+
+0 0 1 1 1 0 0 0
+0 0 1 4 1 0 0 0
+0 0 1 0 1 1 1 1
+1 1 1 3 0 3 4 1
+1 4 0 3 2 1 1 1
+1 1 1 1 3 1 0 0
+0 0 0 1 4 1 0 0
+0 0 0 1 1 1 0 0
+
+0 0 1 1 1 1 1 0
+1 1 1 4 3 0 1 0
+1 0 0 0 0 0 1 0
+1 0 0 0 0 0 1 0
+1 0 0 3 4 0 1 0
+1 2 0 0 1 1 1 0
+1 1 1 1 1 0 0 0
+0 0 0 0 0 0 0 0
+
+0 0 1 1 1 1 0 0
+1 1 1 0 0 1 0 0
+1 2 0 4 3 1 1 0
+1 0 0 0 3 0 1 0
+1 0 0 4 0 0 1 0
+1 0 0 0 0 0 1 0
+1 1 1 1 1 1 1 0
+0 0 0 0 0 0 0 0
+
+0 1 1 1 1 1 0 0
+1 1 2 0 0 1 1 0
+1 0 0 1 0 0 1 0
+1 0 3 5 3 0 1 0
+1 0 0 4 0 0 1 0
+1 1 0 4 0 1 1 0
+0 1 1 1 1 1 0 0
+0 0 0 0 0 0 0 0
+
+1 1 1 1 1 1 0 0
+1 0 0 0 0 1 1 1
+1 0 0 0 4 4 0 1
+1 0 3 3 3 2 0 1
+1 0 0 1 0 4 0 1
+1 1 1 1 1 1 1 1
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+
+0 1 1 1 1 1 0 0
+1 1 4 0 0 1 1 1
+1 0 0 1 0 3 2 1
+1 0 0 1 0 1 0 1
+1 0 5 0 0 3 4 1
+1 0 0 0 0 1 1 1
+1 1 1 1 1 1 0 0
+0 0 0 0 0 0 0 0
+
+1 1 1 1 1 1 0 0
+1 2 5 0 0 1 1 0
+1 0 3 1 0 0 1 0
+1 0 3 0 4 0 1 0
+1 4 0 0 0 1 1 0
+1 1 1 1 1 1 0 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+
+0 1 1 1 1 1 1 0
+1 1 0 0 0 0 1 1
+1 0 5 5 0 0 0 1
+1 0 1 0 3 3 3 1
+1 0 0 0 1 2 4 1
+1 1 1 1 1 1 1 1
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+
+1 1 1 1 1 1 0 0
+1 4 2 5 0 1 1 0
+1 3 0 0 3 0 1 0
+1 0 0 0 1 0 1 0
+1 0 0 4 0 0 1 0
+1 1 1 1 1 1 1 0
+0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0
+
+1 1 1 1 1 1 0 0
+1 2 0 4 4 1 0 0
+1 0 1 3 0 1 1 0
+1 0 1 0 0 0 1 0
+1 0 0 3 1 0 1 0
+1 0 0 5 0 0 1 0
+1 1 1 1 1 1 1 0
+0 0 0 0 0 0 0 0
+
+1 1 1 1 1 0 0 0
+1 0 0 0 1 0 0 0
+1 0 1 0 1 1 1 0
+1 5 4 3 0 0 1 0
+1 0 0 1 3 0 1 0
+1 2 0 0 0 4 1 0
+1 1 1 1 1 1 1 0
+0 0 0 0 0 0 0 0
+
+0 1 1 1 1 1 1 0
+1 1 0 0 0 0 1 1
+1 0 3 0 3 3 0 1
+1 4 4 4 4 4 4 1
+1 0 3 3 0 3 0 1
+1 1 1 0 2 1 1 1
+0 0 1 1 1 1 0 0
+0 0 0 0 0 0 0 0