Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-03-26 18:10:17 +0000
committerStijn Buys <ingar@osirion.org>2008-03-26 18:10:17 +0000
commit2b9f068e7ee4c0d249c715f9eb5a3c2c8a11e6f8 (patch)
treefcd373f97385dc150437bc09b2143e0ceee589e1 /src/client
parenta29aa1ee2935857f616351a23578311f514516d4 (diff)
win32 updates
Diffstat (limited to 'src/client')
-rw-r--r--src/client/client.cc2
-rw-r--r--src/client/client.h2
-rw-r--r--src/client/video.cc3
3 files changed, 3 insertions, 4 deletions
diff --git a/src/client/client.cc b/src/client/client.cc
index 99bd41f..b09618e 100644
--- a/src/client/client.cc
+++ b/src/client/client.cc
@@ -60,7 +60,7 @@ void func_r_restart(std::stringstream &args)
//--- public ------------------------------------------------------
-void main(int count, char **arguments)
+void client_main(int count, char **arguments)
{
std::cout << core::name() << " " << core::version() << std::endl;
diff --git a/src/client/client.h b/src/client/client.h
index 2113202..b1a50df 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -11,7 +11,7 @@
namespace client {
/// the client main loop
-void main(int count, char **arguments);
+void client_main(int count, char **arguments);
}
diff --git a/src/client/video.cc b/src/client/video.cc
index a7a74d5..e41f774 100644
--- a/src/client/video.cc
+++ b/src/client/video.cc
@@ -215,7 +215,7 @@ void screenshot()
unsigned char *rgb_data = (unsigned char *) malloc(video::width * video::height * 3);
// read OpenGL pixels into the buffer
- //glReadBuffer(GL_FRONT);
+ //glReadBuffer(GL_BACK);
glReadPixels(0, 0, (GLsizei) video::width, (GLsizei) video::height, GL_RGB, GL_UNSIGNED_BYTE, (void *) rgb_data);
// either OpenGL actually returns BGR, or TGA wants BGR
@@ -233,7 +233,6 @@ void screenshot()
// close file
ofs.close();
-
con_print << "Wrote " << shortname << std::endl;
}