Browse Source

boat deboard function (better naming convention), disable cooldown when off boat

Image 3 years ago
parent
commit
44c35d3747

+ 2 - 1
EQ2/source/WorldServer/Player.cpp

@@ -3582,10 +3582,11 @@ void Player::PrepareIncomingMovementPacket(int32 len, uchar* data, int16 version
 			if(boat)
 			{
 				boat->RemoveRailPassenger(GetCharacterID());
-				GetZone()->CallSpawnScript(boat, SPAWN_SCRIPT_EMBARK, this);
+				GetZone()->CallSpawnScript(boat, SPAWN_SCRIPT_DEBOARD, this);
 			}
 		}
 		SetBoatSpawn(0);
+		lift_cooldown.Disable();
 	}
 
 	if (!IsResurrecting() && !GetBoatSpawn())

+ 2 - 2
EQ2/source/WorldServer/zoneserver.cpp

@@ -2745,8 +2745,8 @@ bool ZoneServer::CallSpawnScript(Spawn* npc, int8 type, Spawn* spawn, const char
 				result = lua_interface->RunSpawnScript(script, "board", npc, spawn);
 				break;
 			}
-			case SPAWN_SCRIPT_EMBARK: {
-				result = lua_interface->RunSpawnScript(script, "embark", npc, spawn);
+			case SPAWN_SCRIPT_DEBOARD: {
+				result = lua_interface->RunSpawnScript(script, "deboard", npc, spawn);
 				break;
 			}
 			default:

+ 1 - 1
EQ2/source/WorldServer/zoneserver.h

@@ -89,7 +89,7 @@ class Bot;
 #define SPAWN_SCRIPT_PRESPAWN			19
 #define SPAWN_SCRIPT_USEDOOR			20
 #define SPAWN_SCRIPT_BOARD				21
-#define SPAWN_SCRIPT_EMBARK				22
+#define SPAWN_SCRIPT_DEBOARD			22
 
 #define SPAWN_CONDITIONAL_NONE			0
 #define SPAWN_CONDITIONAL_DAY			1