Преглед изворни кода

Fixed a few typos from r14322.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14323 54d463be-8e91-2dee-dedb-b68131a5f0ec
Paradox924X пре 15 година
родитељ
комит
6a72859405
3 измењених фајлова са 7 додато и 7 уклоњено
  1. 1 1
      db/const.txt
  2. 1 1
      src/map/atcommand.c
  3. 5 5
      src/map/script.c

+ 1 - 1
db/const.txt

@@ -228,7 +228,7 @@ mf_town	46
 mf_autotrade	47
 mf_allowks	48
 mf_monster_noteleport	49
-mf_pvpnocalcrank	50
+mf_pvp_nocalcrank	50
 mf_battleground	51
 
 cell_walkable	0

+ 1 - 1
src/map/atcommand.c

@@ -4378,7 +4378,7 @@ int atcommand_mapinfo(const int fd, struct map_session_data* sd, const char* com
 		strcat(atcmd_output, "NoSkill | ");
 	if (map[m_id].flag.noicewall)
 		strcat(atcmd_output, "NoIcewall | ");
-	if (map[m_id].allowks)
+	if (map[m_id].flag.allowks)
 		strcat(atcmd_output, "AllowKS | ");
 	clif_displaymessage(fd, atcmd_output);
 

+ 5 - 5
src/map/script.c

@@ -341,7 +341,7 @@ enum {
 	MF_AUTOTRADE,
 	MF_ALLOWKS,
 	MF_MONSTER_NOTELEPORT,
-	MF_PVPNOCALCRANK,	//50
+	MF_PVP_NOCALCRANK,	//50
 	MF_BATTLEGROUND
 };
 
@@ -9177,7 +9177,7 @@ BUILDIN_FUNC(getmapflag)
 			case MF_AUTOTRADE:			script_pushint(st,map[m].flag.autotrade); break;
 			case MF_ALLOWKS:			script_pushint(st,map[m].flag.allowks); break;
 			case MF_MONSTER_NOTELEPORT:	script_pushint(st,map[m].flag.monster_noteleport); break;
-			case MF_PVPNOCALCRANK:		script_pushint(st,map[m].flag.pvpnocalcrank); break;
+			case MF_PVP_NOCALCRANK:		script_pushint(st,map[m].flag.pvp_nocalcrank); break;
 			case MF_BATTLEGROUND:		script_pushint(st,map[m].flag.battleground); break;
 		}
 	}
@@ -9247,8 +9247,8 @@ BUILDIN_FUNC(setmapflag)
 			case MF_AUTOTRADE:			map[m].flag.autotrade=1; break;
 			case MF_ALLOWKS:			map[m].flag.allowks=1; break;
 			case MF_MONSTER_NOTELEPORT:	map[m].flag.monster_noteleport=1; break;
-			case MF_PVPNOCALCRANK:		map[m].flag.pvpnocalcrank=1; break;
-			case MF_BATTLEGROUND:		map[m].flag.battleground = (!val || atoi(val) < - || atoi(val) > 2) ? 1 : atoi(val); break;
+			case MF_PVP_NOCALCRANK:		map[m].flag.pvp_nocalcrank=1; break;
+			case MF_BATTLEGROUND:		map[m].flag.battleground = (!val || atoi(val) < 0 || atoi(val) > 2) ? 1 : atoi(val); break;
 		}
 	}
 
@@ -9314,7 +9314,7 @@ BUILDIN_FUNC(removemapflag)
 			case MF_AUTOTRADE:			map[m].flag.autotrade=0; break;
 			case MF_ALLOWKS:			map[m].flag.allowks=0; break;
 			case MF_MONSTER_NOTELEPORT:	map[m].flag.monster_noteleport=0; break;
-			case MF_PVPNOCALCRANK:		map[m].flag.pvpnocalcrank=0; break;
+			case MF_PVP_NOCALCRANK:		map[m].flag.pvp_nocalcrank=0; break;
 			case MF_BATTLEGROUND:		map[m].flag.battleground=0; break;
 		}
 	}