Fix change all uses "bit32" for "bit"

modules/corelib/base64.lua

@@ -3,7 +3,7 @@
  base64 -- v1.5.1 public domain Lua base64 encoder/decoder
  no warranty implied; use at your own risk
 
- Needs bit32.extract function. If not present it's implemented using BitOp
+ Needs bit.extract function. If not present it's implemented using BitOp
  or Lua 5.3 native bit operators. For Lua 5.1 fallbacks to pure Lua
  implementation inspired by Rici Lake's post:
    http://ricilake.blogspot.co.uk/2007/10/iterating-bits-in-lua.html
@@ -24,7 +24,7 @@
 
 base64 = {}
 
-local extract = _G.bit32 and _G.bit32.extract
+local extract = _G.bit and _G.bit.extract
 if not extract then
 	if _G.bit then
 		local shl, shr, band = _G.bit.lshift, _G.bit.rshift, _G.bit.band

modules/corelib/keyboard.lua

@@ -239,13 +239,13 @@ function g_keyboard.isInUse()
 end
 
 function g_keyboard.isCtrlPressed()
-  return bit32.band(g_window.getKeyboardModifiers(), KeyboardCtrlModifier) ~= 0
+  return bit.band(g_window.getKeyboardModifiers(), KeyboardCtrlModifier) ~= 0
 end
 
 function g_keyboard.isAltPressed()
-  return bit32.band(g_window.getKeyboardModifiers(), KeyboardAltModifier) ~= 0
+  return bit.band(g_window.getKeyboardModifiers(), KeyboardAltModifier) ~= 0
 end
 
 function g_keyboard.isShiftPressed()
-  return bit32.band(g_window.getKeyboardModifiers(), KeyboardShiftModifier) ~= 0
+  return bit.band(g_window.getKeyboardModifiers(), KeyboardShiftModifier) ~= 0
 end

modules/game_bot/executor.lua

@@ -78,7 +78,6 @@ function executeBot(config, storage, tabs, msgCallback, saveConfigCallback, relo
 
   -- basic functions & classes
   context.print = print
-  context.bit32 = bit32
   context.bit = bit
   context.pairs = pairs
   context.ipairs = ipairs

modules/game_healthinfo/healthinfo.lua

@@ -230,11 +230,11 @@ end
 function onStatesChange(localPlayer, now, old)
   if now == old then return end
 
-  local bitsChanged = bit32.bxor(now, old)
+  local bitsChanged = bit.bxor(now, old)
   for i = 1, 32 do
     local pow = math.pow(2, i-1)
     if pow > bitsChanged then break end
-    local bitChanged = bit32.band(bitsChanged, pow)
+    local bitChanged = bit.band(bitsChanged, pow)
     if bitChanged ~= 0 then
       toggleIcon(bitChanged)
     end

modules/game_inventory/inventory.lua

@@ -475,11 +475,11 @@ end
 
 function onStatesChange(localPlayer, now, old)
   if now == old then return end
-  local bitsChanged = bit32.bxor(now, old)
+  local bitsChanged = bit.bxor(now, old)
   for i = 1, 32 do
     local pow = math.pow(2, i-1)
     if pow > bitsChanged then break end
-    local bitChanged = bit32.band(bitsChanged, pow)
+    local bitChanged = bit.band(bitsChanged, pow)
     if bitChanged ~= 0 then
       toggleIcon(bitChanged)
     end

modules/game_ruleviolation/ruleviolation.lua

@@ -104,7 +104,7 @@ function onSelectReason(reasonLabel, focused)
     actionsTextList:destroyChildren()
     for actionBaseFlag = 0, #rvactions do
       local actionFlagString = rvactions[actionBaseFlag]
-      if bit32.band(reasonLabel.actionFlags, math.pow(2, actionBaseFlag)) > 0 then
+      if bit.band(reasonLabel.actionFlags, math.pow(2, actionBaseFlag)) > 0 then
         local label = g_ui.createWidget('RVListLabel', actionsTextList)
         label:setText(actionFlagString)
         label.actionId = actionBaseFlag

modules/game_topbar/topbar.lua

@@ -292,11 +292,11 @@ end
 function onStatesChange(localPlayer, now, old)
     if now == old then return end
 
-    local bitsChanged = bit32.bxor(now, old)
+    local bitsChanged = bit.bxor(now, old)
     for i = 1, 32 do
         local pow = math.pow(2, i - 1)
         if pow > bitsChanged then break end
-        local bitChanged = bit32.band(bitsChanged, pow)
+        local bitChanged = bit.band(bitsChanged, pow)
         if bitChanged ~= 0 then toggleIcon(bitChanged) end
     end
 end

modules/gamelib/player.lua

@@ -140,7 +140,7 @@ function Player:hasState(state, states)
     local pow = math.pow(2, i-1)
     if pow > states then break end
 
-    local states = bit32.band(states, pow)
+    local states = bit.band(states, pow)
     if states == state then
       return true
     end

src/framework/luaengine/lbitlib.cpp

@@ -1,5 +1,5 @@
 /*
- * This is the bit32 library from lua 5.2.0, backported to
+ * This is the bit library from lua 5.2.0, backported to
  * lua 5.1.4.
  *
  * version 5.2.0-backport4
@@ -164,9 +164,9 @@ static lua_Unsigned luaL_checkunsigned (lua_State *L, int arg) {
 /* ----- Lua 5.2 luaL_newlib() compatibility: ----- */
 
 #define LUAMOD_API  LUALIB_API
-#define LUA_BIT32LIBNAME "bit32"
+#define LUA_BITLIBNAME "bit"
 #ifndef luaL_newlib
-#define luaL_newlib(x, y) luaL_register(x, LUA_BIT32LIBNAME, y)
+#define luaL_newlib(x, y) luaL_register(x, LUA_BITLIBNAME, y)
 #endif
 
 /* ----- avoid a 'symbol redefined' warning below ----- */
@@ -372,7 +372,7 @@ static const luaL_Reg bitlib[] = {
   {NULL, NULL}
 };
 
-int luaopen_bit32 (lua_State *L) {
+int luaopen_bit (lua_State *L) {
   luaL_newlib(L, bitlib);
   return 1;
 }

src/framework/luaengine/lbitlib.h

@@ -25,6 +25,6 @@
 
 struct lua_State;
 
-int luaopen_bit32 (lua_State *L);
+int luaopen_bit (lua_State *L);
 
 #endif

src/framework/luaengine/luainterface.cpp

@@ -738,8 +738,8 @@ void LuaInterface::createLuaState()
     // load lua standard libraries
     luaL_openlibs(L);
 
-    // load bit32 lib for bitwise operations
-    luaopen_bit32(L);
+    // load bit lib for bitwise operations
+    luaopen_bit(L);
 
     // creates weak table
     newTable();