diff --git a/rcbasic_build/rcbasic_build.layout b/rcbasic_build/rcbasic_build.layout
index 7976836..5955503 100755
--- a/rcbasic_build/rcbasic_build.layout
+++ b/rcbasic_build/rcbasic_build.layout
@@ -1,17 +1,22 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -51,44 +56,39 @@
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
diff --git a/rcbasic_runtime/main.cpp b/rcbasic_runtime/main.cpp
index 649b5e9..ccc1239 100755
--- a/rcbasic_runtime/main.cpp
+++ b/rcbasic_runtime/main.cpp
@@ -4445,13 +4445,18 @@ int main(int argc, char * argv[])
std::string debug_opt = "a";
std::cin >> debug_opt;
if(debug_opt.compare("a")==0)
- rc_intern_dirChange("/home/n00b/Downloads/Shuffleboard/");
+ {
+ rc_intern_dirChange("/home/n00b/projects/bu/rcbasic_v400a5_linux/test_project_v4a5");
+ rc_filename = "test.cbc";
+ }
else
+ {
rc_intern_dirChange("/home/n00b/projects/rcbasic_alpha3/test_project");
+ }
#endif
//---------------
- if( (!rc_intern_fileExist(rc_filename)) || rc_filename.compare("")==0 )
+ if( rc_filename.compare("")==0 )
rc_filename = "main.cbc";
if(rcbasic_load(rc_filename))
diff --git a/rcbasic_runtime/rc_gfx.h b/rcbasic_runtime/rc_gfx.h
index 9c776f8..31f448a 100644
--- a/rcbasic_runtime/rc_gfx.h
+++ b/rcbasic_runtime/rc_gfx.h
@@ -1396,7 +1396,10 @@ void rc_setColor(Uint32 color)
Uint32 rc_getPixel(int x, int y)
{
- if(!rc_canvas[0].texture)
+ if(rc_active_canvas < 0 || rc_active_canvas >= rc_canvas.size())
+ return 0;
+
+ if(!rc_canvas[rc_active_canvas].texture)
{
return 0;
}
@@ -1408,7 +1411,7 @@ Uint32 rc_getPixel(int x, int y)
y = 0;
- irr::video::ITexture* texture = rc_canvas[0].texture;
+ irr::video::ITexture* texture = rc_canvas[rc_active_canvas].texture;
video::ECOLOR_FORMAT format = texture->getColorFormat(); //std::cout << "format = " << (int) format << std::endl;
@@ -1424,10 +1427,12 @@ Uint32 rc_getPixel(int x, int y)
irr::video::SColor * texel = (SColor *)(texels + ((y * pitch) + (x * sizeof(SColor))));
- //irr::video::SColor c = texel[0];
+ irr::video::SColor c = texel[0];
texture->unlock();
+ color = c.color;
+
//std::cout << "color(" << x << ", " << y << ") = " << c.getRed() << ", " << c.getGreen() << ", " << c.getBlue() << std::endl;
}
diff --git a/rcbasic_runtime/rcbasic_runtime.depend b/rcbasic_runtime/rcbasic_runtime.depend
index e923e3a..9d644c0 100755
--- a/rcbasic_runtime/rcbasic_runtime.depend
+++ b/rcbasic_runtime/rcbasic_runtime.depend
@@ -1,5 +1,5 @@
# depslib dependency file v1.0
-1732327607 source:/home/n00b/Projects/RCBASIC4/rcbasic_runtime/main.cpp
+1732450472 source:/home/n00b/Projects/RCBASIC4/rcbasic_runtime/main.cpp
"rc_os_defines.h"
@@ -32,7 +32,7 @@
"rc_func130_cases.h"
-1732373037 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_os_defines.h
+1732450897 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_os_defines.h
1732393499 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_defines.h
@@ -1247,7 +1247,7 @@
1727545973 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/RealisticWater.h
-1732393902 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_gfx.h
+1732450927 /home/n00b/Projects/RCBASIC4/rcbasic_runtime/rc_gfx.h
"SDL.h"
diff --git a/rcbasic_runtime/rcbasic_runtime.layout b/rcbasic_runtime/rcbasic_runtime.layout
index dd7076f..261938a 100755
--- a/rcbasic_runtime/rcbasic_runtime.layout
+++ b/rcbasic_runtime/rcbasic_runtime.layout
@@ -2,29 +2,9 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -32,19 +12,19 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -52,14 +32,24 @@
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -67,59 +57,9 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -127,4 +67,89 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+