Revert "fix `gpu.set{Fore,Back}ground returning incorrect values" - n…

…eeds its own branch This reverts commit c939294.
Ocawesome101 · Oct 2, 2022 · fcf5c4e · fcf5c4e
1 parent c939294
commit fcf5c4e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(lua),)
-	lua=5.3
+	lua=5.2
 endif
 
 TARGET_EXEC ?= ocvm

diff --git a/components/gpu.cpp b/components/gpu.cpp
@@ -386,15 +386,10 @@ int Gpu::setColorContext(lua_State* lua, bool bBack)
   }
 
   auto& ref = bBack ? _bg : _fg;
-
-  // store these here - otherwise we get incorrect return values
-  int orgb = ref.rgb;
-  bool opaletted = ref.paletted;
-
   auto ctx = makeColorContext(ref);
   ref = { rgb, p };
 
-  return ValuePack::ret(lua, orgb, opaletted);
+  return ValuePack::ret(lua, std::get<0>(ctx), std::get<1>(ctx));
 }
 
 int Gpu::getColorAssignment(lua_State* lua, bool bBack)