Skip to content

Commit

Permalink
Version 29.6, and fix "Molten " in the HUD for lava
Browse files Browse the repository at this point in the history
  • Loading branch information
jacob1 committed Sep 26, 2014
1 parent 8ed79e2 commit 7bebd2d
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 10 deletions.
6 changes: 6 additions & 0 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -758,6 +758,12 @@ Update version info to TPT version 90.2, allow GRVT and DRAY in saves.
Version 29.5 9/3/14
Update TPTMP to version .8 (fixes TPTMP)

Version 29.6 9/26/14
Fix FIGH drawing. Fix loop edge mode, also stickmen now loop properly. Fix
stickmen spawning with rocket boots. Stamps can be rotated without holding
ctrl. Update TPTMP to version .82. Fix HUD issues with LAVA and FILT. Add a
'rescan stamps' button in the save browser.




Expand Down
4 changes: 2 additions & 2 deletions includes/defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
//VersionInfoEnd

#define MOD_VERSION 29
#define MOD_MINOR_VERSION 5
#define MOD_MINOR_VERSION 6
#define MOD_SAVE_VERSION 20 //This is not the version number of my mod anymore, it's only changed when I change the saving code
#define MOD_BUILD_VERSION 47 //For update checks
#define MOD_BUILD_VERSION 48 //For update checks
#define BETA_VERSION 90
#define BETA_MINOR_VER 1
#define RELEASE_VERSION 90
Expand Down
2 changes: 1 addition & 1 deletion src/hud.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ void SetRightHudText(int x, int y)
}
if (!currentHud[12] && (tctype>=PT_NUM || tctype<0 || (cr&0xFF)==PT_PHOT))
tctype = 0;
if (globalSim->IsElement(tctype))
if (!tctype || globalSim->IsElement(tctype))
sprintf(nametext, "%s (%s), ", ptypes[cr&0xFF].name, ptypes[tctype].name);
else
sprintf(nametext, "%s (%d), ", ptypes[cr&0xFF].name, tctype);
Expand Down
8 changes: 4 additions & 4 deletions src/multiplayer/multiplayer.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
--I highly recommend to use my Autorun Script Manager
--VER 0.81 UPDATE http://pastebin.com/raw.php?i=Dk5Kx4JV

local versionstring = "0.81"
local versionstring = "0.82"

--TODO's
--FIGH,STKM,STK2,LIGH need a few more creation adjustments
Expand Down Expand Up @@ -76,7 +76,7 @@ local function joinChannel(chan)
conSend(38,L.replacemode)
conSend(65,string.char(math.floor(L.dcolour/16777216),math.floor(L.dcolour/65536)%256,math.floor(L.dcolour/256)%256,L.dcolour%256))
end
local function connectToMniip(ip,port,nick)
local function connectToServer(ip,port,nick)
if con.connected then return false,"Already connected" end
ip = ip or "starcatcher.us"
port = port or PORT
Expand Down Expand Up @@ -104,7 +104,7 @@ local function connectToMniip(ip,port,nick)
end
if err=="This nick is already on the server" then
nick = nick:gsub("(.)$",function(s) local n=tonumber(s) if n and n+1 <= 9 then return n+1 else return nick:sub(-1)..'0' end end)
return connectToMniip(ip,port,nick)
return connectToServer(ip,port,nick)
end
return false,err
end
Expand Down Expand Up @@ -558,7 +558,7 @@ new=function(x,y,w,h)
connect = function(self,msg,args)
if not issocket then self:addline("No luasockets found") return end
local newname = tpt.get_name()
local s,r = connectToMniip(args[1],tonumber(args[2]), newname~="" and newname or username)
local s,r = connectToServer(args[1],tonumber(args[2]), newname~="" and newname or username)
if not s then self:addline(r,255,50,50) end
pressedKeys = nil
end,
Expand Down
4 changes: 2 additions & 2 deletions src/multiplayer/multiplayer.lua.cpp

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/simulation/Simulation.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class Simulation

bool IsElement(int t) const
{
return (t>=0 && t<PT_NUM && elements[t].Enabled);
return (t>0 && t<PT_NUM && elements[t].Enabled);
}
bool InBounds(int x, int y)
{
Expand Down

0 comments on commit 7bebd2d

Please sign in to comment.