diff --git a/modules/corelib/util.lua b/modules/corelib/util.lua index adebd2de..6861bccd 100644 --- a/modules/corelib/util.lua +++ b/modules/corelib/util.lua @@ -3,7 +3,7 @@ function print(...) local msg = "" for i,v in ipairs({...}) do - msg = msg .. tostring(v) .. "\t" + msg = msg .. tostring(v) .. " " end g_logger.log(LogInfo, msg) end diff --git a/modules/game_console/console.lua b/modules/game_console/console.lua index b7677c17..46e3ae80 100644 --- a/modules/game_console/console.lua +++ b/modules/game_console/console.lua @@ -388,7 +388,7 @@ function popupMenu(mousePos, mouseButton, creatureName, text) if creatureName then if creatureName ~= g_game.getCharacterName() then menu:addOption(tr('Message to ' .. creatureName), function () g_game.openPrivateChannel(creatureName) end) - if (not Player:hasVip(creatureName)) then + if not g_game.getLocalPlayer():hasVip(creatureName) then menu:addOption(tr('Add to VIP list'), function () g_game.addVip(creatureName) end) end -- TODO ignore creatureName @@ -599,7 +599,7 @@ function onTalk(name, level, mode, message, channelId, creaturePos) if channel then addText(composedMessage, speaktype, channel, name) - elseif channelId ~= 0 then + else -- server sent a message on a channel that is not open pwarning('message in channel id ' .. channelId .. ' which is unknown, this is a server bug, relogin if you want to see messages in this channel') end @@ -685,7 +685,7 @@ function onGameStart() if savedChannels then for channelName, channelId in pairs(savedChannels) do channelId = tonumber(channelId) - if channelId ~= 0 and channelId < 100 then + if channelId ~= -1 and channelId < 100 then if not table.find(channels, channelId) then g_game.joinChannel(channelId) end diff --git a/src/otclient/creature.cpp b/src/otclient/creature.cpp index e0da44e9..4f676c45 100644 --- a/src/otclient/creature.cpp +++ b/src/otclient/creature.cpp @@ -339,6 +339,7 @@ void Creature::onAppear() callLuaField("onAppear"); // walk } else if(m_oldPosition != m_position && m_oldPosition.isInRange(m_position,1,1) && m_allowAppearWalk) { + m_allowAppearWalk = false; walk(m_oldPosition, m_position); callLuaField("onWalk", m_oldPosition, m_position); // teleport diff --git a/src/otclient/lightview.cpp b/src/otclient/lightview.cpp index 10fbed32..04402960 100644 --- a/src/otclient/lightview.cpp +++ b/src/otclient/lightview.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2012 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/lightview.h b/src/otclient/lightview.h index 3e3aff18..7a9d6760 100644 --- a/src/otclient/lightview.h +++ b/src/otclient/lightview.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2012 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/tile.cpp b/src/otclient/tile.cpp index 642d5dfe..08df965e 100644 --- a/src/otclient/tile.cpp +++ b/src/otclient/tile.cpp @@ -441,7 +441,7 @@ ThingPtr Tile::getTopMultiUseThing() for(uint i = 0; i < m_things.size(); ++i) { ThingPtr thing = m_things[i]; - if(thing->isForceUse() || (!thing->isGround() && !thing->isGroundBorder() && !thing->isOnBottom() && !thing->isOnTop())) { + if(thing->isForceUse() || (!thing->isGround() && !thing->isGroundBorder() && !thing->isOnBottom() && !thing->isOnTop() && !thing->isCreature())) { if(i > 0 && thing->isSplash()) return m_things[i-1]; return thing; @@ -450,7 +450,7 @@ ThingPtr Tile::getTopMultiUseThing() for(uint i = 0; i < m_things.size(); ++i) { ThingPtr thing = m_things[i]; - if(!thing->isGround() && !thing->isGroundBorder() && !thing->isOnTop()) + if(!thing->isGround() && !thing->isGroundBorder() && !thing->isOnTop() && !thing->isCreature()) return thing; }