widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/small-fixes into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~hjd/widelands/small-fixes/+merge/248165

Fixes a warning and unifies and picks one version of two nearly identical strings.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/small-fixes into lp:widelands.

=== modified file 'src/scripting/lua_globals.cc'
--- src/scripting/lua_globals.cc	2014-11-18 19:30:39 +0000
+++ src/scripting/lua_globals.cc	2015-01-30 20:51:59 +0000
@@ -98,11 +98,7 @@
 					fmt % luaL_checkstring(L, i);
 					break;
 
-				case LUA_TTABLE:
-				case LUA_TFUNCTION:
-				case LUA_TUSERDATA:
-				case LUA_TTHREAD:
-				case LUA_TLIGHTUSERDATA:
+				default:
 					report_error(L, "Cannot format the given type %s at index %i", lua_typename(L, i), i);
 			}
 		}

=== modified file 'tribes/barbarians/battlearena/help.lua'
--- tribes/barbarians/battlearena/help.lua	2014-07-25 12:19:33 +0000
+++ tribes/barbarians/battlearena/help.lua	2015-01-30 20:51:59 +0000
@@ -17,7 +17,7 @@
 	--General Section
 	building_help_general_string("barbarians", building_description,
 		_"Trains soldiers in ‘Evade’." .. " " .. _"‘Evade’ increases the soldier’s chance not to be hit by the enemy and so to remain totally unaffected.",
-		_"Barbarian soldiers cannot be trained in ‘Defense’ and will remain at the level with which they came.") ..
+		_"Barbarian soldiers cannot be trained in ‘Defense’ and will remain at their initial level.") ..
 
 	--Dependencies
 	-- We would need to parse the production programs to automate the parameters here; so we do it manually