clonekeenplus-commits Mailing List for Commander Genius
Commander Keen Interpreter
Brought to you by:
gerstrong
Menu
▾
▴
clonekeenplus-commits — This list has the lastest commits (GIT)
You can subscribe to this list here.
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(19) |
Jul
(117) |
Aug
(96) |
Sep
(27) |
Oct
(47) |
Nov
(26) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2011 |
Jan
(30) |
Feb
(53) |
Mar
(34) |
Apr
(26) |
May
(22) |
Jun
(26) |
Jul
(25) |
Aug
(15) |
Sep
(2) |
Oct
(5) |
Nov
(6) |
Dec
(11) |
|
From: Gerstrong <ger...@us...> - 2011-12-30 10:29:12
|
- Log -----------------------------------------------------------------
commit 7308990a5c60811abb1f10cc38e4121f16ada4be
Author: Gerhard Stein <ger...@gm...>
Date: Fri Dec 30 11:30:49 2011 +0100
Transparent XPM Support now working!
commit 0ea92b714ac1b9199c4083619cc7b3263188eb2a
Merge: 30563aa 0c9f6b1
Author: Gerhard Stein <ger...@gm...>
Date: Fri Dec 30 10:24:13 2011 +0100
Merge branch 'master' into gui
commit 30563aa82cf33a0bca07012b6e6fcb9b6c4bdd1f
Merge: 4dc19ea 9316b38
Author: Gerhard Stein <ger...@gm...>
Date: Sun Dec 25 13:29:52 2011 +0100
Merge branch 'master' into gui
Conflicts:
website/index.html
commit 4dc19ea3d161deea7f60a2c941bb1812aa37d812
Author: Gerhard Stein <ger...@gm...>
Date: Sun Dec 25 13:28:12 2011 +0100
Embedded fontmap
commit a11b17afb84715215c485a7257150f0aff178e4d
Merge: e89bc51 a73fa2a
Author: Gerhard Stein <ger...@gm...>
Date: Sun Dec 11 16:43:57 2011 +0100
Merge branch 'master' of ssh://clonekeenplus.git.sourceforge.net/gitroot/clonekeenplus/clonekeenplus into gui
commit e89bc51d74f7e6bea427ae6647be2e184c1bc40c
Author: Gerhard Stein <ger...@gm...>
Date: Sun Dec 4 19:40:30 2011 +0100
Button class implemented
commit 2af062fccc5761bea0c9a0b48ab25c776e538fa7
Author: Gerhard Stein <ger...@gm...>
Date: Sun Nov 27 21:08:15 2011 +0100
Bitmap draw integrated to drawing task and blitsurface fixes
commit ab9b4870132acb7d9119bf20c69a75216991e2c3
Author: Gerhard Stein <ger...@gm...>
Date: Sat Nov 26 15:50:49 2011 +0100
Now the GUI-Launcher works properly
commit 20f4f0b83e59f1a19c99a71429682c22eb85c2a1
Author: Gerhard Stein <ger...@gm...>
Date: Sat Nov 26 15:09:58 2011 +0100
Button for launching the chosen game
commit 41b896a962dc9b9c736516b628b2d36bade67d5b
Author: Gerhard Stein <ger...@gm...>
Date: Sat Nov 26 13:16:55 2011 +0100
Button Control has been added
commit e4e8129ad41fa36b72e49de341f9a26735740628
Author: Gerhard Stein <ger...@gm...>
Date: Sat Nov 26 11:17:35 2011 +0100
Relativ hit detection is now working in GUIs!
commit 9614953035006790ca1fb30511a57a5055970eb7
Author: Gerhard Stein <ger...@gm...>
Date: Sat Nov 26 08:46:17 2011 +0100
GUI improvements making all coordinates relative
commit 09ca507fe0f2d6d567ec837a895e250c0f375896
Author: Gerhard Stein <ger...@gm...>
Date: Tue Nov 22 15:57:04 2011 +0100
Mouse moved extended by button state up and down
commit 4a54dcf6d929f2ea1d280fcc11c3b0e89dae4bb1
Author: Gerhard Stein <ger...@gm...>
Date: Sun Nov 20 20:48:02 2011 +0100
Hit detection with the mouse on the GUI is implemented.
commit abb7b08b6cf6da049d4b29d714c3aa49d7f234b6
Author: Gerhard Stein <ger...@gm...>
Date: Sun Nov 20 18:50:51 2011 +0100
Move of CInput now applied to the header files where needed
commit 27df44b5700210f6cf73512f6c9987d1b4524de4
Author: Gerhard Stein <ger...@gm...>
Date: Sun Nov 20 18:36:32 2011 +0100
move Input Files to a directory
commit 3eb831784d3e22b38d9902d9ddcb2571bbd07f79
Merge: c8dfb0f 88dfb2a
Author: Gerhard Stein <ger...@gm...>
Date: Sun Nov 20 18:32:22 2011 +0100
Merge branch 'master' into gui
commit c8dfb0f73291274b0936569196612a9b0fa60ba6
Author: Gerhard Stein <ger...@gm...>
Date: Thu Nov 17 08:29:57 2011 +0100
enabling GUI stuff
commit f64bc96b5c8da0bdc8aaed718a98368e5cd7b033
Merge: e8c73e7 972d6c5
Author: Gerhard Stein <ger...@gm...>
Date: Wed Nov 16 19:31:16 2011 +0100
Merge branch 'master' into gui
commit e8c73e78de93498525eeda38ebc032d2db2ea95c
Merge: 6736beb 8acd4d6
Author: Gerhard Stein <ger...@gm...>
Date: Sun Nov 13 20:04:08 2011 +0100
Merge branch 'master' into gui
commit 6736beb83483558d1d076a32c250bb272f3a6708
Author: Gerhard Stein <ger...@gm...>
Date: Tue Nov 1 19:48:35 2011 +0100
Small Text test in CGUISelectionTextControl
commit b0b5149a556a6bcd94fd8d05f3dee8ccb49b95df
Author: Gerhard Stein <ger...@gm...>
Date: Tue Nov 1 19:05:07 2011 +0100
Launcher Updates and more GUI Elements
commit b6f736b0face64a3b3fb1cea223c9f7cb6f9a3ac
Author: Gerhard Stein <ger...@gm...>
Date: Tue Nov 1 13:19:38 2011 +0100
CRect is now a template class but still compatible to SDL_Rect
commit c1019d12c941f858c223d5d50a050150dd3236c8
Author: Gerhard Stein <ger...@gm...>
Date: Sun Oct 30 19:49:50 2011 +0100
Added TextControl and is already working
commit c5cc4167c2434d0f278f6ee3ec1d148166beb035
Author: Gerhard Stein <ger...@gm...>
Date: Sun Oct 30 18:58:44 2011 +0100
GUIDialog integration
commit 11646189d0508f9d1b5a059ad5d3caa0fc6dcc04
Merge: f0faff8 4fbc4aa
Author: Gerhard Stein <ger...@gm...>
Date: Sun Oct 30 18:19:18 2011 +0100
Merge branch 'master' into gui
commit f0faff890f95fe16bca52d372029ba4a9fd0ba62
Author: Gerhard Stein <ger...@gm...>
Date: Sun Oct 30 18:19:06 2011 +0100
CGUIDialog created
commit e1e566a4d6f4e340f8c4c4b50cdff89229496d44
Author: Gerhard Stein <ger...@gm...>
Date: Sun Oct 30 18:18:38 2011 +0100
Removed obsolete files
commit 1cf550766db877a53f0c6a008a842be783f4c20f
Author: Gerhard Stein <ger...@gm...>
Date: Sat Oct 29 13:24:00 2011 +0200
New Dialog Interface added!
-----------------------------------------------------------------------
hooks/post-receive
--
clonekeenplus
|
|
From: Gerstrong <ger...@us...> - 2011-12-27 12:48:26
|
via 0c9f6b10b6257e874e59cb4fac724e778d2f5b89 (commit)
from f5c34fc4d04201c53f1364aad4c91ffd654c7ce6 (commit)
- Log -----------------------------------------------------------------
commit 0c9f6b10b6257e874e59cb4fac724e778d2f5b89
Author: Gerhard Stein <ger...@gm...>
Date: Tue Dec 27 13:47:25 2011 +0100
bugs fixes -> cmake improved SDL_INCLUDE and "OGL_Filter" only saved when OGL is really used
-----------------------------------------------------------------------
Summary of changes:
build.cmake | 5 +++--
src/CGame.cpp | 4 ++--
src/common/CSettings.cpp | 11 +++++++----
src/core/CGameControl.h | 2 +-
src/main.cpp | 2 +-
5 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/build.cmake b/build.cmake
index b00ab28..72a4a1c 100644
--- a/build.cmake
+++ b/build.cmake
@@ -205,7 +205,8 @@ ENDIF (TREMOR)
IF (SDL)
- INCLUDE_DIRECTORIES(${CMAKE_INCLUDE_PATH}/SDL)
+ set(SDL_INCLUDE_PATH ${CMAKE_INCLUDE_PATH}/SDL)
+ INCLUDE_DIRECTORIES(${SDL_INCLUDE_PATH})
ENDIF (SDL)
IF (OPENGL)
@@ -301,10 +302,10 @@ MESSAGE( "CMAKE_FIND_ROOT_PATH = ${CMAKE_FIND_ROOT_PATH}" )
MESSAGE( "CMAKE_INCLUDE_PATH = ${CMAKE_INCLUDE_PATH}" )
MESSAGE( "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )
MESSAGE( "CMAKE_LIBRARY_PATH = ${CMAKE_LIBRARY_PATH}" )
+MESSAGE( "SDL_INCLUDE_PATH = ${SDL_INCLUDE_PATH}" )
MESSAGE( "Compile it with OpenGL : OPENGL = ${OPENGL}" )
MESSAGE( "We use OGG Vorbis : OGG = ${OGG}" )
MESSAGE( "We use Tremor : TREMOR = ${TREMOR}" )
MESSAGE( "You are on 64-bit System : HAVE_64_BIT = ${HAVE_64_BIT}" )
MESSAGE( "USRDIR = ${USRDIR}" )
MESSAGE( "Commander Genius Version : CG_VERSION = ${CG_VERSION}" )
-
diff --git a/src/CGame.cpp b/src/CGame.cpp
index 09f686e..6d6dee0 100644
--- a/src/CGame.cpp
+++ b/src/CGame.cpp
@@ -46,7 +46,8 @@ bool CGame::init(int argc, char *argv[])
if(!g_pSettings->loadDrvCfg())
{
m_firsttime = true;
- g_pLogFile->textOut(PURPLE,"First time message: CKP didn't find the driver config file. However, it generated some default values and will save them now.<br>");
+ g_pLogFile->textOut(RED,"First time message: CKP didn't find the driver config file. ");
+ g_pLogFile->textOut(RED,"However, it generated some default values and will save them now.\n");
g_pSettings->saveDrvCfg();
}
@@ -159,4 +160,3 @@ void CGame::cleanup()
g_pVideoDriver->Del();
g_pTimer->Del();
}
-
diff --git a/src/common/CSettings.cpp b/src/common/CSettings.cpp
index bee4b31..4cfd10e 100644
--- a/src/common/CSettings.cpp
+++ b/src/common/CSettings.cpp
@@ -52,7 +52,8 @@ bool CSettings::saveDrvCfg()
Configuration.WriteInt("Video", "height", VidConf.m_DisplayRect.h);
Configuration.WriteInt("Video", "scale", VidConf.Zoom);
#ifdef USE_OPENGL
- Configuration.WriteInt("Video", "OGLfilter", VidConf.m_opengl_filter);
+ if(VidConf.m_opengl)
+ Configuration.WriteInt("Video", "OGLfilter", VidConf.m_opengl_filter);
#endif
Configuration.WriteInt("Video", "filter", VidConf.m_ScaleXFilter);
Configuration.SetKeyword("Video", "specialfx", VidConf.m_special_fx);
@@ -106,9 +107,6 @@ bool CSettings::loadDrvCfg()
}
Configuration.ReadKeyword("Video", "fullscreen", &VidConf.Fullscreen, false);
-#ifdef USE_OPENGL
- Configuration.ReadInteger("Video", "OGLfilter", &VidConf.m_opengl_filter, false);
-#endif
Configuration.ReadInteger("Video", "scale", &value, 1);
VidConf.Zoom = value;
Configuration.ReadKeyword("Video", "specialfx", &VidConf.m_special_fx, true);
@@ -116,6 +114,11 @@ bool CSettings::loadDrvCfg()
Configuration.ReadInteger("Video", "filter", &value, 1);
VidConf.m_ScaleXFilter = value;
Configuration.ReadKeyword("Video", "OpenGL", &VidConf.m_opengl, false);
+#ifdef USE_OPENGL
+ if(VidConf.m_opengl)
+ Configuration.ReadInteger("Video", "OGLfilter", &VidConf.m_opengl_filter, false);
+#endif
+
st_camera_bounds &CameraBounds = VidConf.m_CameraBounds;
Configuration.ReadInteger("Bound", "left", &CameraBounds.left, 152);
diff --git a/src/core/CGameControl.h b/src/core/CGameControl.h
index ef351b5..4dd923f 100644
--- a/src/core/CGameControl.h
+++ b/src/core/CGameControl.h
@@ -4,7 +4,7 @@
* Created on: 22.09.2009
* Author: gerstrong
*
- * Auxiliary Class for CGame. It only tell the Game-Engine what to do.
+ * Auxiliary Class for CGame. It only tells the Game-Engine what to do.
*/
#ifndef CGAMECONTROL_H_
diff --git a/src/main.cpp b/src/main.cpp
index 3f8d225..5903936 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
g_pLogFile->CreateLogfile("CGLog.html");
// The Game Class instance is the main class managing whole
- // interpreter instance. TODO: It should be singleton
+ // interpreter instance. TODO: It should be a singleton
CGame Game;
////////////////////////////
hooks/post-receive
--
clonekeenplus
|
|
From: Gerstrong <ger...@us...> - 2011-12-27 11:59:44
|
via f5c34fc4d04201c53f1364aad4c91ffd654c7ce6 (commit)
from 9316b380b98aa8009385203f2669cb85c005c536 (commit)
- Log -----------------------------------------------------------------
commit f5c34fc4d04201c53f1364aad4c91ffd654c7ce6
Author: Gerhard Stein <ger...@gm...>
Date: Tue Dec 27 12:58:17 2011 +0100
Cosmetics
-----------------------------------------------------------------------
Summary of changes:
src/main.cpp | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main.cpp b/src/main.cpp
index bef46d0..3f8d225 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,14 +22,15 @@
- The Commander Genius Team
CloneKeen 2003-2005 Caitlin Shaw
- CloneKeenPlus 2008-2011 Gerstrong
- Commander Genius 2009-2011 Tulip, Pickle, DaVince, Albert and Pizza2004
- Commander Genius 2010-2011 Lemm, Commander Spleen, Zear, Pelya and FCTW
+ CloneKeenPlus 2008-2012 Gerstrong
+ Commander Genius 2009-2012 Tulip, Pickle, DaVince, Albert and Pizza2004
+ Commander Genius 2010-2012 Lemm, Commander Spleen, Zear, Pelya and FCTW
*/
#ifdef ANDROID
-#include <SDL_main.h>
+ #include <SDL_main.h>
#endif
+
#include "CLogFile.h"
#include "CGame.h"
#include "FindFile.h"
@@ -43,23 +44,27 @@
* where the passed arguments are stored
* in the process
* \return This always returns 0. If
- * some errors appear, please take a look
+ * some errors appear, take a look
* at the Logfile.
*
*/
int main(int argc, char *argv[])
{
+ // Check if CG should look into a given directory
if(argc >= 1)
{
binary_dir = argv[0];
size_t slashpos = findLastPathSep(binary_dir);
+
if(slashpos != std::string::npos)
{
binary_dir.erase(slashpos);
binary_dir = SystemNativeToUtf8(binary_dir);
}
else
+ {
binary_dir = ".";
+ }
}
else
{
@@ -74,7 +79,10 @@ int main(int argc, char *argv[])
g_pLogFile->CreateLogfile("CGLog.html");
+ // The Game Class instance is the main class managing whole
+ // interpreter instance. TODO: It should be singleton
CGame Game;
+
////////////////////////////
// Initialize Game Engine //
////////////////////////////
@@ -93,7 +101,7 @@ int main(int argc, char *argv[])
g_pLogFile->Del();
- std::cout << "Thank you very much for playing this wonderful game!" << std::endl;
+ std::cout << "Thank you very much for playing this game!" << std::endl;
UnInitThreadPool();
return 0;
hooks/post-receive
--
clonekeenplus
|
|
From: Casey B. <fc...@us...> - 2011-12-22 16:54:33
|
via 9316b380b98aa8009385203f2669cb85c005c536 (commit)
from e9976e72a216e8a41623c9533627a52e36191dd0 (commit)
- Log -----------------------------------------------------------------
commit 9316b380b98aa8009385203f2669cb85c005c536
Author: Casey Bird <FromCrimsonToWool+SourceTree@Gmail.com>
Date: Thu Dec 22 11:53:21 2011 -0500
-LessCSS WHOOOO!!!
-----------------------------------------------------------------------
Summary of changes:
website/main.less | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/website/main.less b/website/main.less
index 1ced54f..dad002d 100644
--- a/website/main.less
+++ b/website/main.less
@@ -41,7 +41,7 @@ body {
color: @white;
background-color: @white;
- background-image: url( /img/stars.jpg );
+ background-image: url( '/img/stars.jpg' );
background-repeat: repeat;
background-attachment: fixed;
@@ -108,7 +108,7 @@ a[href ^="mailto:"] {
padding-right: 1.5em;
background-color: transparent;
- background-image: url( /img/icon_mailto.gif );
+ background-image: url( '/img/icon_mailto.gif' );
background-repeat: no-repeat;
background-position: center right;
}
@@ -117,7 +117,7 @@ a[href ^="http"] {
padding-right: 1.5em;
background-color: transparent;
- background-image: url( /img/icon_external.gif );
+ background-image: url( '/img/icon_external.gif' );
background-repeat: no-repeat;
background-position: center right;
}
@@ -223,43 +223,43 @@ td, th {
}
#indexLink {
- background-image: url( /img/buttonAbout.jpg );
+ background-image: url( '/img/buttonAbout.jpg' );
}
#newsLink {
- background-image: url( /img/buttonNews.jpg );
+ background-image: url( '/img/buttonNews.jpg' );
}
#downLink {
- background-image: url( /img/buttonDown.jpg );
+ background-image: url( '/img/buttonDown.jpg' );
}
#forumLink {
- background-image: url( /img/buttonForum.jpg );
+ background-image: url( '/img/buttonForum.jpg' );
}
#docLink {
- background-image: url( /img/buttonDoc.jpg );
+ background-image: url( '/img/buttonDoc.jpg' );
}
#compatLink {
- background-image: url( /img/buttonCompat.jpg );
+ background-image: url( '/img/buttonCompat.jpg' );
}
#scrLink {
- background-image: url( /img/buttonScr.jpg );
+ background-image: url( '/img/buttonScr.jpg' );
}
#vidLink {
- background-image: url( /img/buttonVid.jpg );
+ background-image: url( '/img/buttonVid.jpg' );
}
#linksLink {
- background-image: url( /img/buttonLinks.jpg );
+ background-image: url( '/img/buttonLinks.jpg' );
}
#tracLink {
- background-image: url( /img/buttonTrac.jpg );
+ background-image: url( '/img/buttonTrac.jpg' );
}
}
@@ -308,7 +308,7 @@ td, th {
color: black;
background-color: @lightGrey;
- background-image: url( /img/navbasebg.jpg );
+ background-image: url( '/img/navbasebg.jpg' );
background-repeat: repeat-x;
background-position: top;
hooks/post-receive
--
clonekeenplus
|
|
From: Casey B. <fc...@us...> - 2011-12-22 01:35:08
|
via e9976e72a216e8a41623c9533627a52e36191dd0 (commit)
from 3971e5ef8418ff302533c066e526056f4eb88ee8 (commit)
- Log -----------------------------------------------------------------
commit e9976e72a216e8a41623c9533627a52e36191dd0
Author: Casey Bird <FromCrimsonToWool+SourceTree@Gmail.com>
Date: Wed Dec 21 20:34:11 2011 -0500
-LessCSS WHOOOO!!!
-----------------------------------------------------------------------
Summary of changes:
website/.htaccess | 7 +-
website/custom/packages/less/js/less-1.1.5.min.js | 16 +
website/custom/templates/site/contentHeader.php | 12 +-
website/custom/templates/site/header.php | 8 +-
website/index.php | 6 +-
website/main.css | 335 -----------------
website/main.less | 413 +++++++++++++++++++++
website/news.php | 20 +-
8 files changed, 460 insertions(+), 357 deletions(-)
create mode 100644 website/custom/packages/less/js/less-1.1.5.min.js
delete mode 100644 website/main.css
create mode 100644 website/main.less
diff --git a/website/.htaccess b/website/.htaccess
index b7d3e64..39e0aff 100644
--- a/website/.htaccess
+++ b/website/.htaccess
@@ -1,3 +1,5 @@
+Options -MultiViews
+Options +Indexes
RewriteBase /
RewriteEngine On
RewriteCond %{REQUEST_FILENAME} !-f
@@ -7,4 +9,7 @@ RewriteRule ^([^/]+)/([^/]+)/$ /$1/$2.php
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_URI} !(\.[a-zA-Z0-9]{1,5}|/)$
-RewriteRule (.*)$ /$1/ [R=301,L]
\ No newline at end of file
+RewriteRule (.*)$ /$1/ [R=301,L]
+
+# A failed attempt to get LessCSS working
+RewriteRule \.less\.css$ lesscss.php [NC,L]
\ No newline at end of file
diff --git a/website/custom/packages/less/js/less-1.1.5.min.js b/website/custom/packages/less/js/less-1.1.5.min.js
new file mode 100644
index 0000000..92930af
--- /dev/null
+++ b/website/custom/packages/less/js/less-1.1.5.min.js
@@ -0,0 +1,16 @@
+//
+// LESS - Leaner CSS v1.1.5
+// http://lesscss.org
+//
+// Copyright (c) 2009-2011, Alexis Sellier
+// Licensed under the Apache 2.0 License.
+//
+//
+// LESS - Leaner CSS v1.1.5
+// http://lesscss.org
+//
+// Copyright (c) 2009-2011, Alexis Sellier
+// Licensed under the Apache 2.0 License.
+//
+(function(a,b){function c(b){return a.less[b.split("/")[1]]}function l(){var a=document.getElementsByTagName("style");for(var b=0;b<a.length;b++)a[b].type.match(j)&&(new d.Parser).parse(a[b].innerHTML||"",function(c,d){var e=d.toCSS(),f=a[b];try{f.innerHTML=e}catch(g){f.styleSheets.cssText=e}f.type="text/css"})}function m(a,b){for(var c=0;c<d.sheets.length;c++)n(d.sheets[c],a,b,d.sheets.length-(c+1))}function n(b,c,e,f){var h=a.location.href.replace(/[#?].*$/,""),i=b.href.replace(/\?.*$/,""),j=g&&g.getItem(i),k=g&&g.getItem(i+":timestamp"),l={css:j,timestamp:k};/^(https?|file):/.test(i)||(i.charAt(0)=="/"?i=a.location.protocol+"//"+a.location.host+i:i=h.slice(0,h.lastIndexOf("/")+1)+i),q(b.href,b.type,function(a,g){if(!e&&l&&g&&(new Date(g)).valueOf()===(new Date(l.timestamp)).valueOf())p(l.css,b),c(null,b,{local:!0,remaining:f});else try{(new d.Parser({optimization:d.optimization,paths:[i.replace(/[\w\.-]+$/,"")],mime:b.type})).parse(a,function(a,d){if(a)return u(a,i);try{c(d,b,{local:!1,lastModified:g,remaining:f}),s(document.getElementById("less-error-message:"+o(i)))}catch(a){u(a,i)}})}catch(h){u(h,i)}},function(a,b){throw new Error("Couldn't load "+b+" ("+a+")")})}function o(a){return a.replace(/^[a-z]+:\/\/?[^\/]+/,"").replace(/^\//,"").replace(/\?.*$/,"").replace(/\.[^\.\/]+$/,"").replace(/[^\.\w-]+/g,"-").replace(/\./g,":")}function p(a,b,c){var d,e=b.href?b.href.replace(/\?.*$/,""):"",f="less:"+(b.title||o(e));(d=document.getElementById(f))===null&&(d=document.createElement("style"),d.type="text/css",d.media=b.media||"screen",d.id=f,document.getElementsByTagName("head")[0].appendChild(d));if(d.styleSheet)try{d.styleSheet.cssText=a}catch(h){throw new Error("Couldn't reassign styleSheet.cssText.")}else(function(a){d.childNodes.length>0?d.firstChild.nodeValue!==a.nodeValue&&d.replaceChild(a,d.firstChild):d.appendChild(a)})(document.createTextNode(a));c&&g&&(t("saving "+e+" to cache."),g.setItem(e,a),g.setItem(e+":timestamp",c))}function q(a,b,c,e){function i(b,c,d){b.status>=200&&b.status<300?c(b.responseT |
|
From: Casey B. <fc...@us...> - 2011-12-21 23:25:54
|
via 3971e5ef8418ff302533c066e526056f4eb88ee8 (commit)
via e88e0a0d8995cec75ff10313b35b1aed73e761e3 (commit)
from d5809a54e1a76388fbed4feab82190704dfd4c70 (commit)
- Log -----------------------------------------------------------------
commit 3971e5ef8418ff302533c066e526056f4eb88ee8
Author: Casey Bird <FromCrimsonToWool+SourceTree@Gmail.com>
Date: Wed Dec 21 18:25:04 2011 -0500
-includes on the header, contentHeader, footer, contentFooter ( maintainability x 1,000,000 ^_^ )
-addition of a functional .htaccess file
-changed all files to php
-links can now be referenced as /example/ instead of example.php
commit e88e0a0d8995cec75ff10313b35b1aed73e761e3
Author: Casey Bird <FromCrimsonToWool+SourceTree@Gmail.com>
Date: Wed Dec 21 16:48:16 2011 -0500
-style improvement
-----------------------------------------------------------------------
Summary of changes:
website/.htaccess | 10 +
website/compat.html | 149 ---------------
website/compat.php | 92 +++++++++
website/custom/templates/site/contentFooter.php | 15 ++
website/custom/templates/site/contentHeader.php | 40 ++++
website/custom/templates/site/footer.php | 7 +
website/custom/templates/site/header.php | 27 +++
website/{download.html => download.php} | 107 +++--------
website/{index.html => index.php} | 89 ++-------
website/links.html | 124 ------------
website/links.php | 67 +++++++
website/main.css | 59 +++---
website/news.html | 231 -----------------------
website/news.php | 174 +++++++++++++++++
website/screens.html | 168 ----------------
website/screens.php | 111 +++++++++++
website/videos.html | 160 ----------------
website/videos.php | 103 ++++++++++
18 files changed, 718 insertions(+), 1015 deletions(-)
create mode 100644 website/.htaccess
delete mode 100644 website/compat.html
create mode 100644 website/compat.php
create mode 100644 website/custom/templates/site/contentFooter.php
create mode 100644 website/custom/templates/site/contentHeader.php
create mode 100644 website/custom/templates/site/footer.php
create mode 100644 website/custom/templates/site/header.php
rename website/{download.html => download.php} (61%)
rename website/{index.html => index.php} (63%)
delete mode 100644 website/links.html
create mode 100644 website/links.php
delete mode 100644 website/news.html
create mode 100644 website/news.php
delete mode 100644 website/screens.html
create mode 100644 website/screens.php
delete mode 100644 website/videos.html
create mode 100644 website/videos.php
diff --git a/website/.htaccess b/website/.htaccess
new file mode 100644
index 0000000..b7d3e64
--- /dev/null
+++ b/website/.htaccess
@@ -0,0 +1,10 @@
+RewriteBase /
+RewriteEngine On
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^([^/]+)/$ $1.php
+RewriteRule ^([^/]+)/([^/]+)/$ /$1/$2.php
+
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_URI} !(\.[a-zA-Z0-9]{1,5}|/)$
+RewriteRule (.*)$ /$1/ [R=301,L]
\ No newline at end of file
diff --git a/website/compat.html b/website/compat.html
deleted file mode 100644
index fe5e4d7..0000000
--- a/website/compat.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns= "http://www.w3.org/1999/xhtml" xml:lang= "en" lang= "en">
- <head>
- <!-- Made by Gerstrong & FCTW -->
- <title>Commander Genius Web-Site</title>
- <meta http-equiv= "Content-Type" content= "text/html; charset=iso-8859-1" />
- <meta name= "keywords" content= "Keywords here" />
- <meta name= "description" content= "Description here" />
- <meta name= "author" content= "Gerhard Stein, Casey Bird" />
- <!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
- <meta name= "robots" content= "index, follow" />
- <meta name= "revisit-after" content= "30 days" />
- <meta name= "distribution" content= "global" />
- <meta name= "rating" content= "general" />
- <meta name= "Content-Language" content= "english" />
- <link href= "reset.css" rel= "stylesheet" type= "text/css" />
- <link href= "main.css" rel= "stylesheet" type= "text/css" />
- <link rel= "shortcut icon" href= "favicon.ico" />
- </head>
-
- <body>
- <div id= "header">
- <img src= "img/toplogo.jpg" height= "87" width= "342" id= "headerImg" alt= "The Bean-With-Bacon" />
- <ul>
- <li><a href= "index.html" id= "indexLink" title= "Find out about us. (You know you want to.)">
- <img src= "img/buttonAbout.jpg" height= "40" width= "120" alt= "About Us" />
- About Us</a></li>
- <li><a href= "news.html" id= "newsLink" title= "Have you heard what's new?">
- <img src= "img/buttonNews.jpg" height= "40" width= "120" alt= "News" />
- News</a></li>
- <li><a href= "download.html" id= "downLink" title= "Get this fantastic interpreter.">
- <img src= "img/buttonDown.jpg" height= "40" width= "120" alt= "Download" />
- Download</a></li>
- <li><a href= "http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id= "forumLink" title= "Drop by and say hello on our forum.">
- <img src= "img/buttonForum.jpg" height= "40" width= "120" alt= "Forum" />
- Forum</a></li>
- <li><a href= "doc/html/index.html" id= "docLink" title= "Delve into our documentation.">
- <img src= "img/buttonDoc.jpg" height= "40" width= "120" alt= "Documentation" />
- Documentation</a></li>
- <li><a href= "compat.html" id= "compatLink" title= "View the compatability chart.">
- <img src= "img/buttonCompat.jpg" height= "40" width= "120" alt= "Compatability Chart" />
- Compatability Chart</a></li>
- <li><a href= "screens.html" id= "scrLink" title= "Checkout some screenshots of our project.">
- <img src= "img/buttonScr.jpg" height= "40" width= "120" alt= "Screenshots" />
- Screenshots</a></li>
- <li><a href= "videos.html" id= "vidLink" title= "Drool over our spiffy videos.">
- <img src= "img/buttonVid.jpg" height= "40" width= "120" alt= "Videos" />
- Videos</a></li>
- <li><a href= "links.html" id= "linksLink" title= "See what else we think is cool.">
- <img src= "img/buttonLinks.jpg" height= "40" width= "120" alt= "Links" />
- Links</a></li>
- <li><a href= "http://sourceforge.net/apps/trac/clonekeenplus/" id= "tracLink" title= "Help us squash those nasty little bast--BUGS.">
- <img src= "img/buttonTrac.jpg" height= "40" width= "120" alt= "Trac" />
- Bug Tracker</a></li>
- </ul>
- </div>
-
- <div id= "sidebar">
- <img src= "img/lastlvlep1.jpg" height= "157" width= "150" alt= "Spot - The Yorp" />
- <h6>Commander Keen on modern systems!</h6>
- <p>Enjoy the old but good games with better graphics, sound and controls.</p>
- <h6>Commander Keen 4-6!</h6>
- <p>We are working hard to make Commander Genius compatible with the Galaxy games.</p>
- <a href= "http://sourceforge.net/project/project_donations.php?group_id=249154">
- <img alt= "Please support our project" height= "32" width= "88" src= "http://images.sourceforge.net/images/project-support.jpg" />
- </a>
- </div>
-
- <div id= "mainContent">
- <div></div>
- <h1>Compatibilty Chart</h1>
- <p>This section shows the compatibility of the games, and what problems have been detected so far:</p>
-
- <table>
- <tr>
- <th>Game</th>
- <th>Compatibility/Completness</th>
- <th>Known issues</th>
- </tr>
- <tr>
- <td>Commander Keen: Marooned on Mars</td>
- <td>95 %</td>
- <td><ul><li>minor issues</li></ul></td>
- </tr>
- <tr>
- <td>Commander Keen: Invasion of the Vorticons</td>
- <td>85 %</td>
- <td><ul><li>minor issues</li></ul></td>
- </tr>
- <tr>
- <td>Commander Keen: Keen Must Die</td>
- <td>85 %</td>
- <td><ul><li>minor issues</li></ul></td>
- </tr>
- <tr>
- <td>Keen Dreams</td>
- <td>0 %</td>
- <td></td>
- </tr>
- <tr>
- <td>Commander Keen: Secret of the Oracle</td>
- <td>10 %</td>
- <td><ul><li>
- Keen can walk on the world map.
- Menu works, but that's all
- </li></ul></td>
- </tr>
- <tr>
- <td>Commander Keen Episode 5</td>
- <td>0 %</td>
- <td></td>
- </tr>
- <tr>
- <td>Commander Keen Episode 6</td>
- <td>0 %</td>
- <td></td>
- </tr>
- </table>
-
- <h1>Mods</h1>
- <p>
- Yeah, that's another situation and question. Some mods already work,
- and also some special ones as CG can read Patch code. It does not work
- everything in some of them, but many are supported. Just test it and
- let us know, if something has to be fixed to get the mod working
- correctly.
- </p>
-
- <p>
- Tulip (Martin Hauber) created a special page where he tested those. Check it out!
- </p>
-
- <a href= "http://www.shikadi.net/keenwiki/Commander_Genius">
- <strong>Commander Genius Wiki Page</strong>
- </a>
- </div>
-
- <div id= "footer" class= "containCentered">
- <h6>hosted by</h6>
- <a href= "http://sourceforge.net" class= "centered">
- <img src= "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt= "SourceForge.net Logo" height= "37" width= "125" />
- </a>
- <p class= "centered">2011 Commander Genius is licensed under GPL</p>
- <a href= "mailto:ger...@gm..." class= "baseline centered">by The Commander Genius Team</a>
- </div>
-
- <script type= "text/javascript" src= "tracking.js"></script>
- </body>
-</html>
diff --git a/website/compat.php b/website/compat.php
new file mode 100644
index 0000000..be0e1e5
--- /dev/null
+++ b/website/compat.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @author Casey Bird <FromCrimsonToWool+CommanderGenius@Gmail.com>
+ */
+
+ include("/home/project-web/clonekeenplus/htdocs/custom/templates/site/header.php");
+ include("/home/project-web/clonekeenplus/htdocs/custom/templates/site/contentHeader.php");
+?>
+ <div id= "sidebar">
+ <img src= "/img/lastlvlep1.jpg" height= "157" width= "150" alt= "Spot - The Yorp" />
+ <h6>Commander Keen on modern systems!</h6>
+ <p>Enjoy the old but good games with better graphics, sound and controls.</p>
+ <h6>Commander Keen 4-6!</h6>
+ <p>We are working hard to make Commander Genius compatible with the Galaxy games.</p>
+ <a href= "http://sourceforge.net/project/project_donations.php?group_id=249154">
+ <img alt= "Please support our project" height= "32" width= "88" src= "http://images.sourceforge.net/images/project-support.jpg" />
+ </a>
+ </div>
+
+ <div id= "mainContent">
+ <div></div>
+ <h1>Compatibilty Chart</h1>
+ <p>This section shows the compatibility of the games, and what problems have been detected so far:</p>
+
+ <table>
+ <tr>
+ <th>Game</th>
+ <th>Compatibility/Completness</th>
+ <th>Known issues</th>
+ </tr>
+ <tr>
+ <td>Commander Keen: Marooned on Mars</td>
+ <td>95 %</td>
+ <td><ul><li>minor issues</li></ul></td>
+ </tr>
+ <tr>
+ <td>Commander Keen: Invasion of the Vorticons</td>
+ <td>85 %</td>
+ <td><ul><li>minor issues</li></ul></td>
+ </tr>
+ <tr>
+ <td>Commander Keen: Keen Must Die</td>
+ <td>85 %</td>
+ <td><ul><li>minor issues</li></ul></td>
+ </tr>
+ <tr>
+ <td>Keen Dreams</td>
+ <td>0 %</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>Commander Keen: Secret of the Oracle</td>
+ <td>10 %</td>
+ <td><ul><li>
+ Keen can walk on the world map.
+ Menu works, but that's all
+ </li></ul></td>
+ </tr>
+ <tr>
+ <td>Commander Keen Episode 5</td>
+ <td>0 %</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>Commander Keen Episode 6</td>
+ <td>0 %</td>
+ <td></td>
+ </tr>
+ </table>
+
+ <h1>Mods</h1>
+ <p>
+ Yeah, that's another situation and question. Some mods already work,
+ and also some special ones as CG can read Patch code. It does not work
+ everything in some of them, but many are supported. Just test it and
+ let us know, if something has to be fixed to get the mod working
+ correctly.
+ </p>
+
+ <p>
+ Tulip (Martin Hauber) created a special page where he tested those. Check it out!
+ </p>
+
+ <a href= "http://www.shikadi.net/keenwiki/Commander_Genius">
+ <strong>Commander Genius Wiki Page</strong>
+ </a>
+ </div>
+
+<?php
+ include("/home/project-web/clonekeenplus/htdocs/custom/templates/site/contentFooter.php");
+ include("/home/project-web/clonekeenplus/htdocs/custom/templates/site/footer.php");
+?>
\ No newline at end of file
diff --git a/website/custom/templates/site/contentFooter.php b/website/custom/templates/site/contentFooter.php
new file mode 100644
index 0000000..4812836
--- /dev/null
+++ b/website/custom/templates/site/contentFooter.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @author Casey Bird <FromCrimsonToWool+CommanderGenius@Gmail.com>
+ */
+?>
+<div id= "footer" class= "containCentered">
+ <h6>hosted by</h6>
+ <a href= "http://sourceforge.net" class= "centered">
+ <img src= "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt= "SourceForge.net Logo" height= "37" width= "125" />
+ </a>
+ <p class= "centered">2011 Commander Genius is licensed under GPL</p>
+ <a href= "mailto:ger...@gm..." class= "baseline">by The Commander Genius Team</a>
+</div>
+
+<script type= "text/javascript" src= "/tracking.js"></script>
\ No newline at end of file
diff --git a/website/custom/templates/site/contentHeader.php b/website/custom/templates/site/contentHeader.php
new file mode 100644
index 0000000..49bfd65
--- /dev/null
+++ b/website/custom/templates/site/contentHeader.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @author Casey Bird <FromCrimsonToWool+CommanderGenius@Gmail.com>
+ */
+?>
+<div id= "contentHeader">
+ <img src= "/img/toplogo.jpg" height= "87" width= "342" id= "contentHeaderImg" alt= "The Bean-With-Bacon" />
+ <ul>
+ <li><a href= "/" id= "indexLink" title= "Find out about us. (You know you want to.)">
+ <img src= "/img/buttonAbout.jpg" height= "40" width= "120" alt= "About Us" />
+ About Us</a></li>
+ <li><a href= "/news/" id= "newsLink" title= "Have you heard what's new?">
+ <img src= "/img/buttonNews.jpg" height= "40" width= "120" alt= "News" />
+ News</a></li>
+ <li><a href= "/download/" id= "downLink" title= "Get this fantastic interpreter.">
+ <img src= "/img/buttonDown.jpg" height= "40" width= "120" alt= "Download" />
+ Download</a></li>
+ <li><a href= "http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id= "forumLink" title= "Drop by and say hello on our forum.">
+ <img src= "/img/buttonForum.jpg" height= "40" width= "120" alt= "Forum" />
+ Forum</a></li>
+ <li><a href= "/doc/html/index.html" id= "docLink" title= "Delve into our documentation.">
+ <img src= "/img/buttonDoc.jpg" height= "40" width= "120" alt= "Documentation" />
+ Documentation</a></li>
+ <li><a href= "/compat/" id= "compatLink" title= "View the compatability chart.">
+ <img src= "/img/buttonCompat.jpg" height= "40" width= "120" alt= "Compatability Chart" />
+ Compatability Chart</a></li>
+ <li><a href= "/screens/" id= "scrLink" title= "Checkout some screenshots of our project.">
+ <img src= "/img/buttonScr.jpg" height= "40" width= "120" alt= "Screenshots" />
+ Screenshots</a></li>
+ <li><a href= "/videos/" id= "vidLink" title= "Drool over our spiffy videos.">
+ <img src= "/img/buttonVid.jpg" height= "40" width= "120" alt= "Videos" />
+ Videos</a></li>
+ <li><a href= "/links/" id= "linksLink" title= "See what else we think is cool.">
+ <img src= "/img/buttonLinks.jpg" height= "40" width= "120" alt= "Links" />
+ Links</a></li>
+ <li><a href= "http://sourceforge.net/apps/trac/clonekeenplus/" id= "tracLink" title= "Help us squash those nasty little bast--BUGS.">
+ <img src= "/img/buttonTrac.jpg" height= "40" width= "120" alt= "Trac" />
+ Bug Tracker</a></li>
+ </ul>
+</div>
\ No newline at end of file
diff --git a/website/custom/templates/site/footer.php b/website/custom/templates/site/footer.php
new file mode 100644
index 0000000..c5f0901
--- /dev/null
+++ b/website/custom/templates/site/footer.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @author Casey Bird <FromCrimsonToWool+CommanderGenius@Gmail.com>
+ */
+?>
+ </body>
+</html>
\ No newline at end of file
diff --git a/website/custom/templates/site/header.php b/website/custom/templates/site/header.php
new file mode 100644
index 0000000..117336f
--- /dev/null
+++ b/website/custom/templates/site/header.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @author Casey Bird <FromCrimsonToWool+CommanderGenius@Gmail.com>
+ */
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns= "http://www.w3.org/1999/xhtml" xml:lang= "en" lang= "en">
+ <head>
+ <!-- Made by Gerstrong & FCTW -->
+ <title>Commander Genius Web-Site</title>
+ <meta http-equiv= "Content-Type" content= "text/html; charset=iso-8859-1" />
+ <meta name= "keywords" content= "Keywords here" />
+ <meta name= "description" content= "Description here" />
+ <meta name= "author" content= "Gerhard Stein, Casey Bird" />
+ <!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
+ <meta name= "robots" content= "index, follow" />
+ <meta name= "revisit-after" content= "30 days" />
+ <meta name= "distribution" content= "global" />
+ <meta name= "rating" content= "general" />
+ <meta name= "Content-Language" content= "english" />
+ <link href= "/reset.css" rel= "stylesheet" type= "text/css" />
+ <link href= "/main.css" rel= "stylesheet" type= "text/css" />
+ <link rel= "shortcut icon" href= "/favicon.ico" />
+ </head>
+
+ <body>
\ No newline at end of file
diff --git a/website/download.html b/website/download.php
similarity index 61%
rename from website/download.html
rename to website/download.php
index 3108811..e658f3c 100644
--- a/website/download.html
+++ b/website/download.php
@@ -1,62 +1,13 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns= "http://www.w3.org/1999/xhtml" xml:lang= "en" lang= "en">
- <head>
- <!-- Made by Gerstrong & FCTW -->
- <title>Commander Genius Web-Site</title>
- <meta http-equiv= "Content-Type" content= "text/html; charset=iso-8859-1" />
- <meta name= "keywords" content= "Keywords here" />
- <meta name= "description" content= "Description here" />
- <meta name= "author" content= "Gerhard Stein, Casey Bird" />
- <!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
- <meta name= "robots" content= "index, follow" />
- <meta name= "revisit-after" content= "30 days" />
- <meta name= "distribution" content= "global" />
- <meta name= "rating" content= "general" />
- <meta name= "Content-Language" content= "english" />
- <link href= "reset.css" rel= "stylesheet" type= "text/css" />
- <link href= "main.css" rel= "stylesheet" type= "text/css" />
- <link rel= "shortcut icon" href= "favicon.ico" />
- </head>
-
- <body>
- <div id= "header">
- <img src= "img/toplogo.jpg" height= "87" width= "342" id= "headerImg" alt= "The Bean-With-Bacon" />
- <ul>
- <li><a href= "index.html" id= "indexLink" title= "Find out about us. (You know you want to.)">
- <img src= "img/buttonAbout.jpg" height= "40" width= "120" alt= "About Us" />
- About Us</a></li>
- <li><a href= "news.html" id= "newsLink" title= "Have you heard what's new?">
- <img src= "img/buttonNews.jpg" height= "40" width= "120" alt= "News" />
- News</a></li>
- <li><a href= "download.html" id= "downLink" title= "Get this fantastic interpreter.">
- <img src= "img/buttonDown.jpg" height= "40" width= "120" alt= "Download" />
- Download</a></li>
- <li><a href= "http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id= "forumLink" title= "Drop by and say hello on our forum.">
- <img src= "img/buttonForum.jpg" height= "40" width= "120" alt= "Forum" />
- Forum</a></li>
- <li><a href= "doc/html/index.html" id= "docLink" title= "Delve into our documentation.">
- <img src= "img/buttonDoc.jpg" height= "40" width= "120" alt= "Documentation" />
- Documentation</a></li>
- <li><a href= "compat.html" id= "compatLink" title= "View the compatability chart.">
- <img src= "img/buttonCompat.jpg" height= "40" width= "120" alt= "Compatability Chart" />
- Compatability Chart</a></li>
- <li><a href= "screens.html" id= "scrLink" title= "Checkout some screenshots of our project.">
- <img src= "img/buttonScr.jpg" height= "40" width= "120" alt= "Screenshots" />
- Screenshots</a></li>
- <li><a href= "videos.html" id= "vidLink" title= "Drool over our spiffy videos.">
- <img src= "img/buttonVid.jpg" height= "40" width= "120" alt= "Videos" />
- Videos</a></li>
- <li><a href= "links.html" id= "linksLink" title= "See what else we think is cool.">
- <img src= "img/buttonLinks.jpg" height= "40" width= "120" alt= "Links" />
- Links</a></li>
- <li><a href= "http://sourceforge.net/apps/trac/clonekeenplus/" id= "tracLink" title= "Help us squash those nasty little bast--BUGS.">
- <img src= "img/buttonTrac.jpg" height= "40" width= "120" alt= "Trac" />
- Bug Tracker</a></li>
- </ul>
- </div>
-
+<?php
+/**
+ * @author Casey Bird <FromCrimsonToWool+CommanderGenius@Gmail.com>
+ */
+
+ include("/home/project-web/clonekeenplus/htdocs/custom/templates/site/header.php");
+ include("/home/project-web/clonekeenplus/htdocs/custom/templates/site/contentHeader.php");
+?>
<div id= "sidebar">
- <img src= "img/paris.jpg" height= "157" width= "150" title= "Paris... Why bother saving it?" alt= "Paris... Why bother saving it?" />
+ <img src= "/img/paris.jpg" height= "157" width= "150" title= "Paris... Why bother saving it?" alt= "Paris... Why bother saving it?" />
<h6>Commander Keen on modern systems!</h6>
<p>Enjoy the old but good games with better graphics, sound and controls.</p>
<h6>Commander Keen 4-6!</h6>
@@ -76,11 +27,11 @@
</div>
<div id= "platforms">
- <img class= "floatLeft" width= "442" height= "318" alt= "CKP02ans" src= "img/presenv03cg.png" />
+ <img class= "floatLeft" width= "442" height= "318" alt= "CKP02ans" src= "/img/presenv03cg.png" />
<h1>Commander Genius Platforms</h1>
<p>
- <img width= "32" height= "30" alt= "Win7" src= "img/win7.png" />
+ <img width= "32" height= "30" alt= "Win7" src= "/img/win7.png" />
Windows (98, ME, 2000, XP, Vista, 7 and others) - Version 0.3.7 -
<a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-WIN32.exe/download">Installer (32 bit)</a>
<a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-WIN32.zip/download">ZIP Package (32 bit)</a>
@@ -88,45 +39,45 @@
</p>
<p>
- <img width= "44" height= "48" alt= "Linux" src= "img/linux.jpg" />
+ <img width= "44" height= "48" alt= "Linux" src= "/img/linux.jpg" />
Linux (Binary only) - Version 0.3.7 -
<a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-i386.tar.gz/download">32-bit</a>
<a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-amd64.tar.gz/download">64-bit</a>
</p>
<p>
- <img width= "48" height= "44" alt= "Linux" src= "img/ubuntu.jpg" />
+ <img width= "48" height= "44" alt= "Linux" src= "/img/ubuntu.jpg" />
Ubuntu Linux (11.04 and higher recommended) and Debian based distros - Version 0.3.7 -
<a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-i386.deb/download">32-bit</a>
<a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-amd64.deb/download">64-bit</a>
</p>
<p>
- <img width= "48" height= "48" alt= "Linux" src= "img/fedorasuse.png" />
+ <img width= "48" height= "48" alt= "Linux" src= "/img/fedorasuse.png" />
Fedora (15+) or OpenSuse (11.4+) and RPM based distros - Version 0.3.7 -
<a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-i386.rpm/download">32-bit</a>
<a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-amd64.rpm/download">64-bit</a>
</p>
<p>
- <img width= "51" height= "48" alt= "MacOsX" src= "img/macosx.jpg" />
+ <img width= "51" height= "48" alt= "MacOsX" src= "/img/macosx.jpg" />
MacOS X (10.3 and later) - v0.3.5 -
<a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.5/CGenius-0.3.5-Mac.dmg/download">Universal</a>
</p>
<p>
- <img width= "43" height= "48" alt= "GP2X" src= "img/iphonewallet.jpg" />
+ <img width= "43" height= "48" alt= "GP2X" src= "/img/iphonewallet.jpg" />
iPhone - Commander Genius v0.3.2.x - (Still under construction)
</p>
<p>
- <img width= "48" height= "78" alt= "Android" src= "img/google-android.jpg" />
+ <img width= "48" height= "78" alt= "Android" src= "/img/google-android.jpg" />
Google Android Devices
<a href= "http://www.androidpit.com/en/android/market/apps/app/net.sourceforge.clonekeenplus/Commander-Genius">Commander Genius 0.3.2.x</a>
</p>
<p>
- <img width= "60" height= "48" alt= "GP2X" src= "img/gp2x.jpg" />
+ <img width= "60" height= "48" alt= "GP2X" src= "/img/gp2x.jpg" />
Open Handhelds
<a href= "http://dl.openhandhelds.org/cgi-bin/gp2x.cgi?0,0,0,0,20,2832">Commander Genius (GP2X) [0.3.2.6]</a>
<a href= "http://dl.openhandhelds.org/cgi-bin/wiz.cgi?0,0,0,0,35,55">Commander Genius (Wiz) [0.3.2.6]</a>
@@ -151,7 +102,7 @@
</p>
<p>
- If you want the most recent source code you can also download it per GIT <a href= "http://sourceforge.net/scm/?type=git&group_id=249154">here</a>
+ If you want the most recent source code you can also download it per GIT <a href= "http://sourceforge.net/scm/?type=git&group_id=249154">here</a>
</p>
<h1>Bugs found?</h1>
@@ -165,7 +116,7 @@
</div>
<div id= "highQualityPack">
- <img class= "floatLeft" width= "640" height= "480" alt= "HQP" src= "img/HQP1.png" />
+ <img class= "floatLeft" width= "640" height= "480" alt= "HQP" src= "/img/HQP1.png" />
<h1>High Quality Pack (HQP)</h1>
<p>
@@ -193,7 +144,7 @@
</div>
<div id= "K1">
- <img class= "floatLeft" width= "320" height= "200" alt= "Commander Keen 1" src= "img/keen1title.gif" />
+ <img class= "floatLeft" width= "320" height= "200" alt= "Commander Keen 1" src= "/img/keen1title.gif" />
<h1>Commander Keen Episode 1: "Marooned on Mars"</h1>
<p>
If you don't own any Commander Keen game, you will need
@@ -207,15 +158,7 @@
</div>
</div>
- <div id= "footer" class= "containCentered">
- <h6>hosted by</h6>
- <a href= "http://sourceforge.net" class= "centered">
- <img src= "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt= "SourceForge.net Logo" height= "37" width= "125" />
- </a>
- <p class= "centered">2011 Commander Genius is licensed under GPL</p>
- <a href= "mailto:ger...@gm..." class= "baseline centered">by The Commander Genius Team</a>
- </div>
-
- <script type= "text/javascript" src= "tracking.js"></script>
- </body>
-</html>
+<?php
+ include("/home/project-web/clonekeenplus/htdocs/custom/templates/site/contentFooter.php");
+ include("/home/project-web/clonekeenplus/htdocs/custom/templates/site/footer.php");
+?>
\ No newline at end of file
diff --git a/website/index.html b/website/index.php
similarity index 63%
rename from website/index.html
rename to website/index.php
index da10757..67be2f5 100644
--- a/website/index.html
+++ b/website/index.php
@@ -1,62 +1,13 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns= "http://www.w3.org/1999/xhtml" xml:lang= "en" lang= "en">
- <head>
- <!-- Made by Gerstrong & FCTW -->
- <title>Commander Genius Web-Site</title>
- <meta http-equiv= "Content-Type" content= "text/html; charset=iso-8859-1" />
- <meta name= "keywords" content= "Keywords here" />
- <meta name= "description" content= "Description here" />
- <meta name= "author" content= "Gerhard Stein, Casey Bird" />
- <!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
- <meta name= "robots" content= "index, follow" />
- <meta name= "revisit-after" content= "30 days" />
- <meta name= "distribution" content= "global" />
- <meta name= "rating" content= "general" />
- <meta name= "Content-Language" content= "english" />
- <link href= "reset.css" rel= "stylesheet" type= "text/css" />
- <link href= "main.css" rel= "stylesheet" type= "text/css" />
- <link rel= "shortcut icon" href= "favicon.ico" />
- </head>
-
- <body>
- <div id= "header">
- <img src= "img/toplogo.jpg" height= "87" width= "342" id= "headerImg" alt= "The Bean-With-Bacon" />
- <ul>
- <li><a href= "index.html" id= "indexLink" title= "Find out about us. (You know you want to.)">
- <img src= "img/buttonAbout.jpg" height= "40" width= "120" alt= "About Us" />
- About Us</a></li>
- <li><a href= "news.html" id= "newsLink" title= "Have you heard what's new?">
- <img src= "img/buttonNews.jpg" height= "40" width= "120" alt= "News" />
- News</a></li>
- <li><a href= "download.html" id= "downLink" title= "Get this fantastic interpreter.">
- <img src= "img/buttonDown.jpg" height= "40" width= "120" alt= "Download" />
- Download</a></li>
- <li><a href= "http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id= "forumLink" title= "Drop by and say hello on our forum.">
- <img src= "img/buttonForum.jpg" height= "40" width= "120" alt= "Forum" />
- Forum</a></li>
- <li><a href= "doc/html/index.html" id= "docLink" title= "Delve into our documentation.">
- <img src= "img/buttonDoc.jpg" height= "40" width= "120" alt= "Documentation" />
- Documentation</a></li>
- <li><a href= "compat.html" id= "compatLink" title= "View the compatability chart.">
- <img src= "img/buttonCompat.jpg" height= "40" width= "120" alt= "Compatability Chart" />
- Compatability Chart</a></li>
- <li><a href= "screens.html" id= "scrLink" title= "Checkout some screenshots of our project.">
- <img src= "img/buttonScr.jpg" height= "40" width= "120" alt= "Screenshots" />
- Screenshots</a></li>
- <li><a href= "videos.html" id= "vidLink" title= "Drool over our spiffy videos.">
- <img src= "img/buttonVid.jpg" height= "40" width= "120" alt= "Videos" />
- Videos</a></li>
- <li><a href= "links.html" id= "linksLink" title= "See what else we think is cool.">
- <img src= "img/buttonLinks.jpg" height= "40" width= "120" alt= "Links" />
- Links</a></li>
- <li><a href= "http://sourceforge.net/apps/trac/clonekeenplus/" id= "tracLink" title= "Help us squash those nasty little bast--BUGS.">
- <img src= "img/buttonTrac.jpg" height= "40" width= "120" alt= "Trac" />
- Bug Tracker</a></li>
- </ul>
- </div>
+<?php
+/**
+ * @author Casey Bird <FromCrimsonToWool+CommanderGenius@Gmail.com>
+ */
+ include("/home/project-web/clonekeenplus/htdocs/custom/templates/site/header.php");
+ include("/home/project-web/clonekeenplus/htdocs/custom/templates/site/contentHeader.php");
+?>
<div id= "sidebar">
- <img src= "img/mainpic1.jpg" height= "157" width= "150" alt= "Spot - The Yorp" />
+ <img src= "/img/mainpic1.jpg" height= "157" width= "150" alt= "Spot - The Yorp" />
<h6>Commander Keen on modern systems!</h6>
<p>Enjoy the old but good games with better graphics, sound and controls.</p>
<h6>Commander Keen 4-6!</h6>
@@ -156,7 +107,7 @@
</div>
<div id= "supportInfo">
- <img class= "floatLeft" height= "339" width= "535" alt= "Commander Genius Keen4 - Galaxy" src= "img/keen4coming.png" />
+ <img class= "floatLeft" height= "339" width= "535" alt= "Commander Genius Keen4 - Galaxy" src= "/img/keen4coming.png" />
<h3>Goodbye Galaxy and Keen Dreams support</h3>
<p>
We are working hard on the Commander Genius support
@@ -184,7 +135,7 @@
</div>
<div id= "features">
- <img class= "floatLeft" height= "334" width= "535" alt= "2 Player Keening" src= "img/keenvga1.jpg" />
+ <img class= "floatLeft" height= "334" width= "535" alt= "2 Player Keening" src= "/img/keenvga1.jpg" />
<h3>Features</h3>
<ul>
<li>4 Player Mode</li>
@@ -211,11 +162,11 @@
</ul>
<p>Check it out today, it's free!</p>
- <a href= "download.html">>> Go to the download page here!!</a>
+ <a href= "/download/">>> Go to the download page here!!</a>
</div>
<div id= "improvement">
- <img class= "floatLeft" height= "333" width= "535" alt= "Darkness" src= "img/keendark.jpg" />
+ <img class= "floatLeft" height= "333" width= "535" alt= "Darkness" src= "/img/keendark.jpg" />
<p>
The right hand image that you see is Commander Keen in
a dark room when playing the game normally under DOS
@@ -227,15 +178,7 @@
</div>
</div>
- <div id= "footer" class= "containCentered">
- <h6>hosted by</h6>
- <a href= "http://sourceforge.net" class= "centered">
- <img src= "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt= "SourceForge.net Logo" height= "37" width= "125" />
- </a>
- <p class= "centered">2011 Commander Genius is licensed under GPL</p>
- <a href= "mailto:ger...@gm..." class= "baseline">by The Commander Genius Team</a>
- </div>
-
- <script type= "text/javascript" src= "tracking.js"></script>
- </body>
-</html>
+<?php
+ include("/home/project-web/clonekeenplus/htdocs/custom/templates/site/contentFooter.php");
+ include("/home/project-web/clonekeenplus/htdocs/custom/templates/site/footer.php");
+?>
\ No newline at end of file
diff --git a/website/links.html b/website/links.html
deleted file mode 100644
index 04d04c7..0000000
--- a/website/links.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns= "http://www.w3.org/1999/xhtml" xml:lang= "en" lang= "en">
- <head>
- <!-- Made by Gerstrong & FCTW -->
- <title>Commander Genius Web-Site</title>
- <meta http-equiv= "Content-Type" content= "text/html; charset=iso-8859-1" />
- <meta name= "keywords" content= "Keywords here" />
- <meta name= "description" content= "Description here" />
- <meta name= "author" content= "Gerhard Stein, Casey Bird" />
- <!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
- <meta name= "robots" content= "index, follow" />
- <meta name= "revisit-after" content= "30 days" />
- <meta name= "distribution" content= "global" />
- <meta name= "rating" content= "general" />
- <meta name= "Content-Language" content= "english" />
- <link href= "reset.css" rel= "stylesheet" type= "text/css" />
- <link href= "main.css" rel= "stylesheet" type= "text/css" />
- <link rel= "shortcut icon" href= "favicon.ico" />
- </head>
-
- <body>
- <div id= "header">
- <img src= "img/toplogo.jpg" height= "87" width= "342" id= "headerImg" alt= "The Bean-With-Bacon" />
- <ul>
- <li><a href= "index.html" id= "indexLink" title= "Find out about us. (You know you want to.)">
- <img src= "img/buttonAbout.jpg" height= "40" width= "120" alt= "About Us" />
- About Us</a></li>
- <li><a href= "news.html" id= "newsLink" title= "Have you heard what's new?">
- <img src= "img/buttonNews.jpg" height= "40" width= "120" alt= "News" />
- News</a></li>
- <li><a href= "download.html" id= "downLink" title= "Get this fantastic interpreter.">
- <img src= "img/buttonDown.jpg" height= "40" width= "120" alt= "Download" />
- Download</a></li>
- <li><a href= "http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id= "forumLink" title= "Drop by and say hello on our forum.">
- <img src= "img/buttonForum.jpg" height= "40" width= "120" alt= "Forum" />
- Forum</a></li>
- <li><a href= "doc/html/index.html" id= "docLink" title= "Delve into our documentation.">
- <img src= "img/buttonDoc.jpg" height= "40" width= "120" alt= "Documentation" />
- Documentation</a></li>
- <li><a href= "compat.html" id= "compatLink" title= "View the compatability chart.">
- <img src= "img/buttonCompat.jpg" height= "40" width= "120" alt= "Compatability Chart" />
- Compatability Chart</a></li>
- <li><a href= "screens.html" id= "scrLink" title= "Checkout some screenshots of our project.">
- <img src= "img/buttonScr.jpg" height= "40" width= "120" alt= "Screenshots" />
- Screenshots</a></li>
- <li><a href= "videos.html" id= "vidLink" title= "Drool over our spiffy videos.">
- <img src= "img/buttonVid.jpg" height= "40" width= "120" alt= "Videos" />
- Videos</a></li>
- <li><a href= "links.html" id= "linksLink" title= "See what else we think is cool.">
- <img src= "img/buttonLinks.jpg" height= "40" width= "120" alt= "Links" />
- Links</a></li>
- <li><a href= "http://sourceforge.net/apps/trac/clonekeenplus/" id= "tracLink" title= "Help us squash those nasty little bast--BUGS.">
- <img src= "img/buttonTrac.jpg" height= "40" width= "120" alt= "Trac" />
- Bug Tracker</a></li>
- </ul>
- </div>
-
- <div id= "sidebar">
- <img src= "img/nessiegreet.jpg" height= "157" width= "150" alt= "Keen and Messie" />
- <h6>Commander Keen on modern systems!</h6>
- <p>Enjoy the old but good games with better graphics, sound and controls.</p>
- <h6>Commander Keen 4-6!</h6>
- <p>We are working hard to make Commander Genius compatible with the Galaxy games.</p>
- <a href= "http://sourceforge.net/project/project_donations.php?group_id=249154">
- <img alt= "Please support our project" height= "32" width= "88" src= "http://images.sourceforge.net/images/project-support.jpg" />
- </a>
- </div>
-
- <div id= "mainContent">
- <div></div>
- <h1>Links</h1>
-
- <div></div>
- <a href= "http://clonekeenplus.neejean.org/">Commander Genius Official Forum</a>
- <p>
- This Forum is for users, testers, designers, composers and
- developers of Commander Genius. We are always happy to greet
- your there. It also has a nice chat box! Come in and join
- us!
- </p>
-
- <div></div>
- <a href= "http://www.pckf.com/">Public Commander Keen Forum</a>
- <p>
- Our favorite forum. You can find us all here and discuss
- about several topics around the Keen games. This Site helped
- us a lot and made the interpreter a better program.
- </p>
-
- <div></div>
- <a href= "http://www.shikadi.net/keenwiki/Main_Page">Commander Keen Wiki</a>
- <p>Nice site with information about the Commander Keen Games.</p>
-
- <div></div>
- <a href= "http://www.shikadi.net/moddingwiki/Main_Page">Game Modding Wiki</a>
- <p>
- All the file format structures of some old DOS Games like
- Commander Keen.
- </p>
-
- <div></div>
- <a href= "http://dl.openhandhelds.org/cgi-bin/wiz.cgi">OpenHandhelds Wiz Archive</a>
- <p>Power for your wiz device!</p>
-
- <div></div>
- <a href= "http://davince.tengudev.com/">DaVince's Website</a>
- <p>
- Nice website of a great fan of Commander Keen and good
- artist. It has some games, a blog and much more.
- </p>
- </div>
-
- <div id= "footer" class= "containCentered">
- <h6>hosted by</h6>
- <a href= "http://sourceforge.net" class= "centered">
- <img src= "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt= "SourceForge.net Logo" height= "37" width= "125" />
- </a>
- <p class= "centered">2011 Commander Genius is licensed under GPL</p>
- <a href= "mailto:ger...@gm..." class= "baseline centered">by The Commander Genius Team</a>
- </div>
-
- <script type= "text/javascript" src= "tracking.js"></script>
- </body>
-</html>
diff --git a/website/links.php b/website/links.php
new file mode 100644
index 0000000..2d58251
--- /dev/null
+++ b/website/links.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @author Casey Bird <FromCrimsonToWool+CommanderGenius@Gmail.com>
+ */
+
+ include("/home/project-web/clonekeenplus/htdocs/custom/templates/site/header.php");
+ include("/home/project-web/clonekeenplus/htdocs/custom/templates/site/contentHeader.php");
+?>
+ <div id= "sidebar">
+ <img src= "/img/nessiegreet.jpg" height= "157" width= "150" alt= "Keen and Messie" />
+ <h6>Commander Keen on modern systems!</h6>
+ <p>Enjoy the old but good games with better graphics, sound and controls.</p>
+ <h6>Commander Keen 4-6!</h6>
+ <p>We are working hard to make Commander Genius compatible with the Galaxy games.</p>
+ <a href= "http://sourceforge.net/project/project_donations.php?group_id=249154">
+ <img alt= "Please support our project" height= "32" width= "88" src= "http://images.sourceforge.net/images/project-support.jpg" />
+ </a>
+ </div>
+
+ <div id= "mainContent">
+ <div></div>
+ <h1>Links</h1>
+
+ <div></div>
+ <a href= "http://clonekeenplus.neejean.org/">Commander Genius Official Forum</a>
+ <p>
+ This Forum is for users, testers, designers, composers and
+ developers of Commander Genius. We are always happy to greet
+ your there. It also has a nice chat box! Come in and join
+ us!
+ </p>
+
+ <div></div>
+ <a href= "http://www.pckf.com/">Public Commander Keen Forum</a>
+ <p>
+ Our favorite forum. You can find us all here and discuss
+ about several topics around the Keen games. This Site helped
+ us a lot and made the interpreter a better program.
+ </p>
+
+ <div></div>
+ <a href= "http://www.shikadi.net/keenwiki/Main_Page">Commander Keen Wiki</a>
+ <p>Nice site with information about the Commander Keen Games.</p>
+
+ <div></div>
+ <a href= "http://www.shikadi.net/moddingwiki/Main_Page">Game Modding Wiki</a>
+ <p>
+ All the file format structures of some old DOS Games like
+ Commander Keen.
+ </p>
+
+ <div></div>
+ <a href= "http://dl.openhandhelds.org/cgi-bin/wiz.cgi">OpenHandhelds Wiz Archive</a>
+ <p>Power for your wiz device!</p>
+
+ <div></div>
+ <a href= "http://davince.tengudev.com/">DaVince's Website</a>
+ <p>
+ Nice website of a great fan of Commander Keen and good
+ artist. It has some games, a blog and much more.
+ </p>
+ </div>
+
+<?php
+ include("/home/project-web/clonekeenplus/htdocs/custom/templates/site/contentFooter.php");
+ include("/home/project-web/clonekeenplus/htdocs/custom/templates/site/footer.php");
+?>
\ No newline at end of file
diff --git a/website/main.css b/website/main.css
index 793c2bf..e747d41 100644
--- a/website/main.css
+++ b/website/main.css
@@ -110,24 +110,24 @@ td, th {
}
/* ------------------Header--------------------------- */
-#header {
+#contentHeader {
width: 100%;
overflow: hidden;
}
-#header #headerImg {
+#contentHeader #contentHeaderImg {
float: left;
padding: 0.45em;
height: 5.43em;
}
-#header ul {
+#contentHeader ul {
width: 600px;
float: left;
margin: 1.87em 1.5em 0;
}
-#header li {
+#contentHeader li {
position: relative;
float: left;
text-indent: -187em;
@@ -137,63 +137,65 @@ td, th {
vertical-align: bottom;
}
-#header li a {
+#contentHeader li a {
width: 120px;
height: 20px;
background: transparent none 0 0 no-repeat;
display: block;
}
-#header li a:hover,
-#header li a:focus {
+#contentHeader li a:hover,
+#contentHeader li a:focus {
background-position: 0 -20px;
}
-#header li a:active {
-// background-position: 0 -40px;
+#contentHeader li a:active {
+/*
+ This is intended to be a third color for the nav images to change on click sometime later
+ background-position: 0 -40px; */
}
-#header li a img {
+#contentHeader li a img {
display: none;
}
-#header #indexLink {
+#contentHeader #indexLink {
background-image: url("img/buttonAbout.jpg");
}
-#header #newsLink {
+#contentHeader #newsLink {
background-image: url('img/buttonNews.jpg');
}
-#header #downLink {
+#contentHeader #downLink {
background-image: url('img/buttonDown.jpg');
}
-#header #forumLink {
+#contentHeader #forumLink {
background-image: url('img/buttonForum.jpg');
}
-#header #docLink {
+#contentHeader #docLink {
background-image: url('img/buttonDoc.jpg');
}
-#header #compatLink {
+#contentHeader #compatLink {
background-image: url('img/buttonCompat.jpg');
}
-#header #scrLink {
+#contentHeader #scrLink {
background-image: url('img/buttonScr.jpg');
}
-#header #vidLink {
+#contentHeader #vidLink {
background-image: url('img/buttonVid.jpg');
}
-#header #linksLink {
+#contentHeader #linksLink {
background-image: url('img/buttonLinks.jpg');
}
-#header #tracLink {
+#contentHeader #tracLink {
background-image: url('img/buttonTrac.jpg');
}
@@ -207,13 +209,14 @@ td, th {
#sidebar h6,
#sidebar p {
- color: #2271A0;
- font-weight: bold;
width: 13em;
+ margin: 0;
+ margin-left: 2em;
+ padding: 0;
line-height: normal;
font-size: 0.62em;
- padding: 0;
- margin: 0 0 0 2em;
+ font-weight: bold;
+ color: rgb( 34, 113, 160 );
}
#sidebar h6 {
@@ -221,7 +224,7 @@ td, th {
}
#sidebar p {
- color: #FFF;
+ color: rgb( 255, 255, 255 );
font-weight: normal;
}
@@ -232,11 +235,11 @@ td, th {
/* ------------------Main Content--------------------------- */
#mainContent {
- background: #BBB url("img/navbasebg.jpg") repeat-x top;
+ margin-right: 9.37em;
+ padding: 1em 0 0;
+ background: rgb( 187, 187, 187 ) url("img/navbasebg.jpg") repeat-x top;
color: black;
- width: auto;
overflow: hidden;
- padding: 1em 0 0;
}
#mainContent div {
diff --git a/website/news.html b/website/news.html
deleted file mode 100644
index 28ef0a9..0000000
--- a/website/news.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns= "http://www.w3.org/1999/xhtml" xml:lang= "en" lang= "en">
- <head>
- <!-- Made by Gerstrong & FCTW -->
- <title>Commander Genius Web-Site</title>
- <meta http-equiv= "Content-Type" content= "text/html; charset=iso-8859-1" />
- <meta name= "keywords" content= "Keywords here" />
- <meta name= "description" content= "Description here" />
- <meta name= "author" content= "Gerhard Stein, Casey Bird" />
- <!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
- <meta name= "robots" content= "index, follow" />
- <meta name= "revisit-after" content= "30 days" />
- <meta name= "distribution" content= "global" />
- <meta name= "rating" content= "general" />
- <meta name= "Content-Language" content= "english" />
- <link href= "reset.css" rel= "stylesheet" type= "text/css" />
- <link href= "main.css" rel= "stylesheet" type= "text/css" />
- <link rel= "shortcut icon" href= "favicon.ico" />
- </head>
-
- <body>
- <div id= "header">
- <img src= "img/toplogo.jpg" height= "87" width= "342" id= "headerImg" alt= "The Bean-With-Bacon" />
- <ul>
- <li><a href= "index.html" id= "indexLink" title= "Find out about us. (You know you want to.)">
- <img src= "img/buttonAbout.jpg" height= "40" width= "120" alt= "About Us" />
- About Us</a></li>
- <li><a href= "news.html" id= "newsLink" title= "Have you heard what's new?">
- <img src= "img/buttonNews.jpg" height= "40" width= "120" alt= "News" />
- News</a></li>
- <li><a href= "download.html" id= "downLink" title= "Get this fantastic interpreter.">
- <img src= "img/buttonDown.jpg" height= "40" width= "120" alt= "Download" />
- Download</a></li>
- <li><a href= "http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id= "forumLink" title= "Drop by and say hello on our forum.">
- <img src= "img/buttonForum.jpg" height= "40" width= "120" alt= "Forum" />
- Forum</a></li>
- <li><a href= "doc/html/index.html" id= "docLink" title= "Delve into our documentation.">
- <img src= "img/buttonDoc.jpg" height= "40" width= "120" alt= "Documentation" />
- Documentation</a></li>
- <li><a href= "compat.html" id= "compatLink" title= "View the compatability chart.">
- <img src= "img/buttonCompat.jpg" height= "40" width= "120" alt= "Compatability Chart" />
- Compatability Chart</a></li>
- <li><a href= "screens.html" id= "scrLink" title= "Checkout some screenshots of our project.">
- <img src= "img/buttonScr.jpg" height= "40" width= "120" alt= "Screenshots" />
- Screenshots</a></li>
- <li><a href= "videos.html" id= "vidLink" title= "Drool over our spiffy videos.">
- <img src= "img/buttonVid.jpg" height= "40" width= "120" alt= "Videos" />
- Videos</a></li>
- <li><a href= "links.html" id= "linksLink" title= "See what else we think is cool.">
- <img src= "img/buttonLinks.jpg" height= "40" width= "120" alt= "Links" />
- Links</a></li>
- <li><a href= "http://sourceforge.net/apps/trac/clonekeenplus/" id= "tracLink" title= "Help us squash those nasty little bast--BUGS.">
- <img src= "img/buttonTrac.jpg" height= "40" width= "120" alt= "Trac" />
- Bug Tracker</a></li>
- </ul>
- </div>
-
- <div id = "sidebar">
- <img src = "img/secret3.jpg" height="157" width="150" alt = "Secret Island in Commander Keen: Keen Must Die" />
- <h6>Commander Keen on modern systems!</h6>
- <p>Enjoy the old but good games with better graphics, sound and controls.</p>
- <h6>Commander Keen 4-6!</h6>
- <p>We are working hard to make Commander Genius compatible with the Galaxy games.</p>
- <a href="http://sourceforge.net/project/project_donations.php?group_id=249154">
- <img alt="Please support our project" height = "32" width = "88" src = "http://images.sourceforge.net/images/project-support.jpg" />
- </a>
- </div>
-
- <div id = "mainContent">
- <div></div>
- <h1>News</h1>
- <div class = "fauxTable">
- <h2>August 28th 2011</h2>
- <p>
- - Updated Commander Genius (ver. 0.3.7).
- <a href = "download.html">Go check it out!</a>
- </p>
- </div>
- <div class = "fauxTable">
- <h2>August 3rd 2011</h2>
- <p>
- - Updated Commander Genius (ver. 0.3.6.1).
- <a href = "download.html">Go check it out!</a>
- </p>
- </div>
- <div class = "fauxTable">
- <h2>July 31st 2011</h2>
- <p>
- - Updated Commander Genius (ver. 0.3.6)
- - Now RPM Based distros are also available
- <a href = "download.html">Go check it out!</a>
- </p>
- </div>
- <div class = "fauxTable">
- <h2>July 10th 2011</h2>
- <p>
- - Updated Commander Genius (ver. 0.3.5) for Mac
- <a href = "download.html">Go check it out!</a>
- </p>
- </div>
- <div class = "fauxTable">
- <h2>June 29th 2011</h2>
- <p>
- - Updated Commander Genius (ver. 0.3.5)
- <a href = "download.html">Go check it out!</a>
- </p>
- </div>
- <div class = "fauxTable">
- <h2>May 31st 2011</h2>
- <p>
- - Updated Commander Genius (ver. 0.3.3.4)
- <a href = "download.html">Go check it out!</a>
- </p>
- </div>
- <div class = "fauxTable">
- <h2>May 1st 2011</h2>
- <p>
- - Updated Commander Geniu...
[truncated message content] |
![http://images.sourceforge.net/images/project-support.jpg"](http://images.sourceforge.net/images/project-support.jpg"){kind=link}
|
From: Casey B. <fc...@us...> - 2011-12-21 21:24:59
|
via d5809a54e1a76388fbed4feab82190704dfd4c70 (commit)
from c54055c13e83bad15964f224ed88161ee9be84d8 (commit)
- Log -----------------------------------------------------------------
commit d5809a54e1a76388fbed4feab82190704dfd4c70
Author: Casey Bird <FromCrimsonToWool+SourceTree@Gmail.com>
Date: Wed Dec 21 16:07:12 2011 -0500
-code formatting cleanups
-bug avoidance
-----------------------------------------------------------------------
Summary of changes:
website/compat.html | 116 ++++++++++++++-------------
website/download.html | 164 +++++++++++++++++++-------------------
website/img/cgkeen4title-new.png | Bin 0 -> 296720 bytes
website/img/cgkeen4title.png | Bin 66581 -> 62338 bytes
website/img/keen4play1.jpg | Bin 0 -> 70923 bytes
website/img/lampk2cg.png | Bin 0 -> 81246 bytes
website/img/lampk2db.png | Bin 0 -> 32632 bytes
website/index.html | 114 +++++++++++++-------------
website/links.html | 104 ++++++++++++------------
website/main.css | 9 +-
website/news.html | 78 +++++++++---------
website/screens.html | 118 ++++++++++++++--------------
website/videos.html | 152 ++++++++++++++++++------------------
13 files changed, 428 insertions(+), 427 deletions(-)
create mode 100644 website/img/cgkeen4title-new.png
create mode 100644 website/img/keen4play1.jpg
create mode 100644 website/img/lampk2cg.png
create mode 100644 website/img/lampk2db.png
diff --git a/website/compat.html b/website/compat.html
index c14fda2..fe5e4d7 100644
--- a/website/compat.html
+++ b/website/compat.html
@@ -1,72 +1,72 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns= "http://www.w3.org/1999/xhtml" xml:lang= "en" lang= "en">
<head>
<!-- Made by Gerstrong & FCTW -->
<title>Commander Genius Web-Site</title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <meta name="keywords" content="Keywords here" />
- <meta name="description" content="Description here" />
- <meta name="author" content="Gerhard Stein" />
+ <meta http-equiv= "Content-Type" content= "text/html; charset=iso-8859-1" />
+ <meta name= "keywords" content= "Keywords here" />
+ <meta name= "description" content= "Description here" />
+ <meta name= "author" content= "Gerhard Stein, Casey Bird" />
<!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
- <meta name="robots" content="index, follow" />
- <meta name="revisit-after" content="30 days" />
- <meta name="distribution" content="global" />
- <meta name="rating" content="general" />
- <meta name="Content-Language" content="english" />
- <link href="reset.css" rel="stylesheet" type="text/css" />
- <link href="main.css" rel="stylesheet" type="text/css" />
- <link rel="shortcut icon" href="img/favicon.ico" />
+ <meta name= "robots" content= "index, follow" />
+ <meta name= "revisit-after" content= "30 days" />
+ <meta name= "distribution" content= "global" />
+ <meta name= "rating" content= "general" />
+ <meta name= "Content-Language" content= "english" />
+ <link href= "reset.css" rel= "stylesheet" type= "text/css" />
+ <link href= "main.css" rel= "stylesheet" type= "text/css" />
+ <link rel= "shortcut icon" href= "favicon.ico" />
</head>
<body>
- <div id = "header">
- <img src = "img/toplogo.jpg" height="87px" width="342px" id = "headerImg" alt = "The Bean-With-Bacon" />
+ <div id= "header">
+ <img src= "img/toplogo.jpg" height= "87" width= "342" id= "headerImg" alt= "The Bean-With-Bacon" />
<ul>
- <li><a href="index.html" id = "indexLink" title = "Find out about us. (You know you want to.)">
- <img src = "img/buttonAbout.jpg" height = "20px" width = "120px" alt = "About Us" />
- About Us</a></li>
- <li><a href="news.html" id = "newsLink" title = "Have you heard what's new?">
- <img src = "img/buttonNews.jpg" height = "20px" width = "120px" alt = "News" />
- News</a></li>
- <li><a href="download.html" id = "downLink" title = "Get this fantastic interpreter.">
- <img src = "img/buttonDown.jpg" height = "20px" width = "120px" alt = "Download" />
- Download</a></li>
- <li><a href="http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id = "forumLink" title = "Drop by and say hello on our forum.">
- <img src = "img/buttonForum.jpg" height = "20px" width = "120px" alt = "Forum" />
- Forum</a></li>
- <li><a href="doc/html/index.html" id = "docLink" title = "Delve into our documentation.">
- <img src = "img/buttonDoc.jpg" height = "20px" width = "120px" alt = "Documentation" />
- Documentation</a></li>
- <li><a href="compat.html" id = "compatLink" title = "View the compatability chart.">
- <img src = "img/buttonCompat.jpg" height = "20px" width = "120px" alt = "Compatability Chart" />
- Compatability Chart</a></li>
- <li><a href="screens.html" id = "scrLink" title = "Checkout some screenshots of our project.">
- <img src = "img/buttonScr.jpg" height = "20px" width = "120px" alt = "Screenshots" />
- Screenshots</a></li>
- <li><a href="videos.html" id = "vidLink" title = "Drool over our spiffy videos.">
- <img src = "img/buttonVid.jpg" height = "20px" width = "120px" alt = "Videos" />
- Videos</a></li>
- <li><a href="links.html" id = "linksLink" title = "See what else we think is cool.">
- <img src = "img/buttonLinks.jpg" height = "20px" width = "120px" alt = "Links" />
- Links</a></li>
- <li><a href="http://sourceforge.net/apps/trac/clonekeenplus/" id = "tracLink" title = "Help us squash those nasty little bast--BUGS.">
- <img src = "img/buttonTrac.jpg" height = "20px" width = "120px" alt = "Trac" />
- Bug Tracker</a></li>
+ <li><a href= "index.html" id= "indexLink" title= "Find out about us. (You know you want to.)">
+ <img src= "img/buttonAbout.jpg" height= "40" width= "120" alt= "About Us" />
+ About Us</a></li>
+ <li><a href= "news.html" id= "newsLink" title= "Have you heard what's new?">
+ <img src= "img/buttonNews.jpg" height= "40" width= "120" alt= "News" />
+ News</a></li>
+ <li><a href= "download.html" id= "downLink" title= "Get this fantastic interpreter.">
+ <img src= "img/buttonDown.jpg" height= "40" width= "120" alt= "Download" />
+ Download</a></li>
+ <li><a href= "http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id= "forumLink" title= "Drop by and say hello on our forum.">
+ <img src= "img/buttonForum.jpg" height= "40" width= "120" alt= "Forum" />
+ Forum</a></li>
+ <li><a href= "doc/html/index.html" id= "docLink" title= "Delve into our documentation.">
+ <img src= "img/buttonDoc.jpg" height= "40" width= "120" alt= "Documentation" />
+ Documentation</a></li>
+ <li><a href= "compat.html" id= "compatLink" title= "View the compatability chart.">
+ <img src= "img/buttonCompat.jpg" height= "40" width= "120" alt= "Compatability Chart" />
+ Compatability Chart</a></li>
+ <li><a href= "screens.html" id= "scrLink" title= "Checkout some screenshots of our project.">
+ <img src= "img/buttonScr.jpg" height= "40" width= "120" alt= "Screenshots" />
+ Screenshots</a></li>
+ <li><a href= "videos.html" id= "vidLink" title= "Drool over our spiffy videos.">
+ <img src= "img/buttonVid.jpg" height= "40" width= "120" alt= "Videos" />
+ Videos</a></li>
+ <li><a href= "links.html" id= "linksLink" title= "See what else we think is cool.">
+ <img src= "img/buttonLinks.jpg" height= "40" width= "120" alt= "Links" />
+ Links</a></li>
+ <li><a href= "http://sourceforge.net/apps/trac/clonekeenplus/" id= "tracLink" title= "Help us squash those nasty little bast--BUGS.">
+ <img src= "img/buttonTrac.jpg" height= "40" width= "120" alt= "Trac" />
+ Bug Tracker</a></li>
</ul>
</div>
- <div id = "sidebar">
- <img src = "img/lastlvlep1.jpg" height="157px" width="150px" alt = "Spot - The Yorp" />
+ <div id= "sidebar">
+ <img src= "img/lastlvlep1.jpg" height= "157" width= "150" alt= "Spot - The Yorp" />
<h6>Commander Keen on modern systems!</h6>
<p>Enjoy the old but good games with better graphics, sound and controls.</p>
<h6>Commander Keen 4-6!</h6>
<p>We are working hard to make Commander Genius compatible with the Galaxy games.</p>
- <a href="http://sourceforge.net/project/project_donations.php?group_id=249154">
- <img alt="Please support our project" height = "32px" width = "88px" src = "http://images.sourceforge.net/images/project-support.jpg" />
+ <a href= "http://sourceforge.net/project/project_donations.php?group_id=249154">
+ <img alt= "Please support our project" height= "32" width= "88" src= "http://images.sourceforge.net/images/project-support.jpg" />
</a>
</div>
- <div id = "mainContent">
+ <div id= "mainContent">
<div></div>
<h1>Compatibilty Chart</h1>
<p>This section shows the compatibility of the games, and what problems have been detected so far:</p>
@@ -130,18 +130,20 @@
Tulip (Martin Hauber) created a special page where he tested those. Check it out!
</p>
- <a style="font-weight: bold;" href="http://www.shikadi.net/keenwiki/Commander_Genius">Commander Genius Wiki Page</a>
+ <a href= "http://www.shikadi.net/keenwiki/Commander_Genius">
+ <strong>Commander Genius Wiki Page</strong>
+ </a>
</div>
- <div id = "footer" class = "containCentered">
+ <div id= "footer" class= "containCentered">
<h6>hosted by</h6>
- <a href="http://sourceforge.net" class = "centered">
- <img src = "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt="SourceForge.net Logo" height="37px" width="125px" />
+ <a href= "http://sourceforge.net" class= "centered">
+ <img src= "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt= "SourceForge.net Logo" height= "37" width= "125" />
</a>
- <p class = "centered">2011 Commander Genius is licensed under GPL</p>
- <a href="mailto:%20g...@gm..." class="baseline centered">by The Commander Genius Team</a>
+ <p class= "centered">2011 Commander Genius is licensed under GPL</p>
+ <a href= "mailto:ger...@gm..." class= "baseline centered">by The Commander Genius Team</a>
</div>
- <script type="text/javascript" src = "tracking.js"></script>
+ <script type= "text/javascript" src= "tracking.js"></script>
</body>
</html>
diff --git a/website/download.html b/website/download.html
index 1a09af6..3108811 100644
--- a/website/download.html
+++ b/website/download.html
@@ -1,73 +1,73 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns= "http://www.w3.org/1999/xhtml" xml:lang= "en" lang= "en">
<head>
<!-- Made by Gerstrong & FCTW -->
<title>Commander Genius Web-Site</title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <meta name="keywords" content="Keywords here" />
- <meta name="description" content="Description here" />
- <meta name="author" content="Gerhard Stein" />
+ <meta http-equiv= "Content-Type" content= "text/html; charset=iso-8859-1" />
+ <meta name= "keywords" content= "Keywords here" />
+ <meta name= "description" content= "Description here" />
+ <meta name= "author" content= "Gerhard Stein, Casey Bird" />
<!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
- <meta name="robots" content="index, follow" />
- <meta name="revisit-after" content="30 days" />
- <meta name="distribution" content="global" />
- <meta name="rating" content="general" />
- <meta name="Content-Language" content="english" />
- <link href="reset.css" rel="stylesheet" type="text/css" />
- <link href="main.css" rel="stylesheet" type="text/css" />
- <link rel="shortcut icon" href="img/favicon.ico" />
+ <meta name= "robots" content= "index, follow" />
+ <meta name= "revisit-after" content= "30 days" />
+ <meta name= "distribution" content= "global" />
+ <meta name= "rating" content= "general" />
+ <meta name= "Content-Language" content= "english" />
+ <link href= "reset.css" rel= "stylesheet" type= "text/css" />
+ <link href= "main.css" rel= "stylesheet" type= "text/css" />
+ <link rel= "shortcut icon" href= "favicon.ico" />
</head>
<body>
- <div id = "header">
- <img src = "img/toplogo.jpg" height="87px" width="342px" id = "headerImg" alt = "The Bean-With-Bacon" />
+ <div id= "header">
+ <img src= "img/toplogo.jpg" height= "87" width= "342" id= "headerImg" alt= "The Bean-With-Bacon" />
<ul>
- <li><a href="index.html" id = "indexLink" title = "Find out about us. (You know you want to.)">
- <img src = "img/buttonAbout.jpg" height = "20px" width = "120px" alt = "About Us" />
+ <li><a href= "index.html" id= "indexLink" title= "Find out about us. (You know you want to.)">
+ <img src= "img/buttonAbout.jpg" height= "40" width= "120" alt= "About Us" />
About Us</a></li>
- <li><a href="news.html" id = "newsLink" title = "Have you heard what's new?">
- <img src = "img/buttonNews.jpg" height = "20px" width = "120px" alt = "News" />
+ <li><a href= "news.html" id= "newsLink" title= "Have you heard what's new?">
+ <img src= "img/buttonNews.jpg" height= "40" width= "120" alt= "News" />
News</a></li>
- <li><a href="download.html" id = "downLink" title = "Get this fantastic interpreter.">
- <img src = "img/buttonDown.jpg" height = "20px" width = "120px" alt = "Download" />
+ <li><a href= "download.html" id= "downLink" title= "Get this fantastic interpreter.">
+ <img src= "img/buttonDown.jpg" height= "40" width= "120" alt= "Download" />
Download</a></li>
- <li><a href="http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id = "forumLink" title = "Drop by and say hello on our forum.">
- <img src = "img/buttonForum.jpg" height = "20px" width = "120px" alt = "Forum" />
+ <li><a href= "http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id= "forumLink" title= "Drop by and say hello on our forum.">
+ <img src= "img/buttonForum.jpg" height= "40" width= "120" alt= "Forum" />
Forum</a></li>
- <li><a href="doc/html/index.html" id = "docLink" title = "Delve into our documentation.">
- <img src = "img/buttonDoc.jpg" height = "20px" width = "120px" alt = "Documentation" />
+ <li><a href= "doc/html/index.html" id= "docLink" title= "Delve into our documentation.">
+ <img src= "img/buttonDoc.jpg" height= "40" width= "120" alt= "Documentation" />
Documentation</a></li>
- <li><a href="compat.html" id = "compatLink" title = "View the compatability chart.">
- <img src = "img/buttonCompat.jpg" height = "20px" width = "120px" alt = "Compatability Chart" />
+ <li><a href= "compat.html" id= "compatLink" title= "View the compatability chart.">
+ <img src= "img/buttonCompat.jpg" height= "40" width= "120" alt= "Compatability Chart" />
Compatability Chart</a></li>
- <li><a href="screens.html" id = "scrLink" title = "Checkout some screenshots of our project.">
- <img src = "img/buttonScr.jpg" height = "20px" width = "120px" alt = "Screenshots" />
+ <li><a href= "screens.html" id= "scrLink" title= "Checkout some screenshots of our project.">
+ <img src= "img/buttonScr.jpg" height= "40" width= "120" alt= "Screenshots" />
Screenshots</a></li>
- <li><a href="videos.html" id = "vidLink" title = "Drool over our spiffy videos.">
- <img src = "img/buttonVid.jpg" height = "20px" width = "120px" alt = "Videos" />
+ <li><a href= "videos.html" id= "vidLink" title= "Drool over our spiffy videos.">
+ <img src= "img/buttonVid.jpg" height= "40" width= "120" alt= "Videos" />
Videos</a></li>
- <li><a href="links.html" id = "linksLink" title = "See what else we think is cool.">
- <img src = "img/buttonLinks.jpg" height = "20px" width = "120px" alt = "Links" />
+ <li><a href= "links.html" id= "linksLink" title= "See what else we think is cool.">
+ <img src= "img/buttonLinks.jpg" height= "40" width= "120" alt= "Links" />
Links</a></li>
- <li><a href="http://sourceforge.net/apps/trac/clonekeenplus/" id = "tracLink" title = "Help us squash those nasty little bast--BUGS.">
- <img src = "img/buttonTrac.jpg" height = "20px" width = "120px" alt = "Trac" />
+ <li><a href= "http://sourceforge.net/apps/trac/clonekeenplus/" id= "tracLink" title= "Help us squash those nasty little bast--BUGS.">
+ <img src= "img/buttonTrac.jpg" height= "40" width= "120" alt= "Trac" />
Bug Tracker</a></li>
</ul>
</div>
- <div id = "sidebar">
- <img src = "img/paris.jpg" height="157px" width="150px" title = "Paris... Why bother saving it?" alt = "Paris... Why bother saving it?" />
+ <div id= "sidebar">
+ <img src= "img/paris.jpg" height= "157" width= "150" title= "Paris... Why bother saving it?" alt= "Paris... Why bother saving it?" />
<h6>Commander Keen on modern systems!</h6>
<p>Enjoy the old but good games with better graphics, sound and controls.</p>
<h6>Commander Keen 4-6!</h6>
<p>We are working hard to make Commander Genius compatible with the Galaxy games.</p>
- <a href="http://sourceforge.net/project/project_donations.php?group_id=249154">
- <img alt="Please support our project" height = "32px" width = "88px" src = "http://images.sourceforge.net/images/project-support.jpg" />
+ <a href= "http://sourceforge.net/project/project_donations.php?group_id=249154">
+ <img alt= "Please support our project" height= "32" width= "88" src= "http://images.sourceforge.net/images/project-support.jpg" />
</a>
</div>
- <div id = "mainContent">
- <div id = "intro">
+ <div id= "mainContent">
+ <div id= "intro">
<h1>Downloads</h1>
<p>
We have the interpreter for different operating systems and
@@ -75,63 +75,63 @@
</p>
</div>
- <div id = "platforms">
- <img class = "floatLeft" width = "420px" height = "323px" alt="CKP02ans" src = "img/presenv03cg.png" />
+ <div id= "platforms">
+ <img class= "floatLeft" width= "442" height= "318" alt= "CKP02ans" src= "img/presenv03cg.png" />
<h1>Commander Genius Platforms</h1>
<p>
- <img width = "32px" height = "30px" alt="Win7" src = "img/win7.png" />
+ <img width= "32" height= "30" alt= "Win7" src= "img/win7.png" />
Windows (98, ME, 2000, XP, Vista, 7 and others) - Version 0.3.7 -
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-WIN32.exe/download">Installer (32 bit)</a>
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-WIN32.zip/download">ZIP Package (32 bit)</a>
+ <a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-WIN32.exe/download">Installer (32 bit)</a>
+ <a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-WIN32.zip/download">ZIP Package (32 bit)</a>
</p>
<p>
- <img width = "44px" height = "48px" alt="Linux" src = "img/linux.jpg" />
+ <img width= "44" height= "48" alt= "Linux" src= "img/linux.jpg" />
Linux (Binary only) - Version 0.3.7 -
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-i386.tar.gz/download">32-bit</a>
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-amd64.tar.gz/download">64-bit</a>
+ <a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-i386.tar.gz/download">32-bit</a>
+ <a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-amd64.tar.gz/download">64-bit</a>
</p>
<p>
- <img width = "48px" height = "44px" alt="Linux" src = "img/ubuntu.jpg" />
+ <img width= "48" height= "44" alt= "Linux" src= "img/ubuntu.jpg" />
Ubuntu Linux (11.04 and higher recommended) and Debian based distros - Version 0.3.7 -
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-i386.deb/download">32-bit</a>
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-amd64.deb/download">64-bit</a>
+ <a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-i386.deb/download">32-bit</a>
+ <a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-amd64.deb/download">64-bit</a>
</p>
<p>
- <img width = "48px" height = "44px" alt="Linux" src = "img/fedorasuse.png" />
+ <img width= "48" height= "48" alt= "Linux" src= "img/fedorasuse.png" />
Fedora (15+) or OpenSuse (11.4+) and RPM based distros - Version 0.3.7 -
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-i386.rpm/download">32-bit</a>
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-amd64.rpm/download">64-bit</a>
+ <a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-i386.rpm/download">32-bit</a>
+ <a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-amd64.rpm/download">64-bit</a>
</p>
<p>
- <img width = "43px" height = "40px" alt="MacOsX" src = "img/macosx.jpg" />
+ <img width= "51" height= "48" alt= "MacOsX" src= "img/macosx.jpg" />
MacOS X (10.3 and later) - v0.3.5 -
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.5/CGenius-0.3.5-Mac.dmg/download">Universal</a>
+ <a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.5/CGenius-0.3.5-Mac.dmg/download">Universal</a>
</p>
<p>
- <img width = "43px" height = "48px" alt="GP2X" src = "img/iphonewallet.jpg" />
+ <img width= "43" height= "48" alt= "GP2X" src= "img/iphonewallet.jpg" />
iPhone - Commander Genius v0.3.2.x - (Still under construction)
</p>
<p>
- <img width = "39px" height = "64px" alt="Android" src = "img/google-android.jpg" />
+ <img width= "48" height= "78" alt= "Android" src= "img/google-android.jpg" />
Google Android Devices
- <a href="http://www.androidpit.com/en/android/market/apps/app/net.sourceforge.clonekeenplus/Commander-Genius">Commander Genius 0.3.2.x</a>
+ <a href= "http://www.androidpit.com/en/android/market/apps/app/net.sourceforge.clonekeenplus/Commander-Genius">Commander Genius 0.3.2.x</a>
</p>
<p>
- <img width = "60px" height = "48px" alt="GP2X" src = "img/gp2x.jpg" />
+ <img width= "60" height= "48" alt= "GP2X" src= "img/gp2x.jpg" />
Open Handhelds
- <a href="http://dl.openhandhelds.org/cgi-bin/gp2x.cgi?0,0,0,0,20,2832">Commander Genius (GP2X) [0.3.2.6]</a>
- <a href="http://dl.openhandhelds.org/cgi-bin/wiz.cgi?0,0,0,0,35,55">Commander Genius (Wiz) [0.3.2.6]</a>
- <a href="http://dl.openhandhelds.org/cgi-bin/pandora.cgi?0,0,0,0,35,50">Commander Genius (Pandora) [0.3.2.6]</a>
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.2.x/cgenius-dingoo-r2.tar.bz2/download">Commander Genius (Dingoo) [0.3.2.6]</a>
+ <a href= "http://dl.openhandhelds.org/cgi-bin/gp2x.cgi?0,0,0,0,20,2832">Commander Genius (GP2X) [0.3.2.6]</a>
+ <a href= "http://dl.openhandhelds.org/cgi-bin/wiz.cgi?0,0,0,0,35,55">Commander Genius (Wiz) [0.3.2.6]</a>
+ <a href= "http://dl.openhandhelds.org/cgi-bin/pandora.cgi?0,0,0,0,35,50">Commander Genius (Pandora) [0.3.2.6]</a>
+ <a href= "http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.2.x/cgenius-dingoo-r2.tar.bz2/download">Commander Genius (Dingoo) [0.3.2.6]</a>
</p>
<h1>Get the latest source code via GIT</h1>
@@ -144,28 +144,28 @@
</p>
<p>
- You can also browse through the Sourceforge.net packages <a href="https://sourceforge.net/project/showfiles.php?group_id=249154">here</a>.
+ You can also browse through the Sourceforge.net packages <a href= "https://sourceforge.net/project/showfiles.php?group_id=249154">here</a>.
They may not be the most stable versions, but they are more recent. If
you find bugs in them we would be happy if you report
them to us so we can improve Commander Genius.
</p>
<p>
- If you want the most recent source code you can also download it per GIT <a href="http://sourceforge.net/scm/?type=git&group_id=249154">here</a>
+ If you want the most recent source code you can also download it per GIT <a href= "http://sourceforge.net/scm/?type=git&group_id=249154">here</a>
</p>
<h1>Bugs found?</h1>
<p>
We are happy to see people who test our product. If you want to report bugs, you can
- do that <a href="http://sourceforge.net/apps/trac/clonekeenplus/">here</a>. This is mainly used by our developers but
+ do that <a href= "http://sourceforge.net/apps/trac/clonekeenplus/">here</a>. This is mainly used by our developers but
can be used by everybody.
</p>
- <a href="http://sourceforge.net/apps/trac/clonekeenplus/">Trac</a>
+ <a href= "http://sourceforge.net/apps/trac/clonekeenplus/">Trac</a>
</div>
- <div id = "highQualityPack">
- <img class = "floatLeft" width = "425px" height = "296px" alt="HQP" src = "img/HQP1.png" />
+ <div id= "highQualityPack">
+ <img class= "floatLeft" width= "640" height= "480" alt= "HQP" src= "img/HQP1.png" />
<h1>High Quality Pack (HQP)</h1>
<p>
@@ -177,7 +177,7 @@
</p>
<p>Try it out! It really makes an old game look great!</p>
- <a href="http://sourceforge.net/projects/clonekeenplus/files/High%20Quality%20Packs/Version%201.x/hqpv18.zip/download">Download</a>
+ <a href= "http://sourceforge.net/projects/clonekeenplus/files/High%20Quality%20Packs/Version%201.x/hqpv18.zip/download">Download</a>
<h1>Tools around Commander Genius</h1>
<p>
@@ -188,12 +188,12 @@
<p>
Take a look at the directory
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Tools/">here</a>
+ <a href= "http://sourceforge.net/projects/clonekeenplus/files/Tools/">here</a>
</p>
</div>
- <div id = "K1">
- <img class = "floatLeft" width = "422px" height = "262px" alt="Commander Keen 1" src = "img/keen1title.gif" />
+ <div id= "K1">
+ <img class= "floatLeft" width= "320" height= "200" alt= "Commander Keen 1" src= "img/keen1title.gif" />
<h1>Commander Keen Episode 1: "Marooned on Mars"</h1>
<p>
If you don't own any Commander Keen game, you will need
@@ -203,19 +203,19 @@
The bundle versions have included this episode already,
so no download needed for those.
</p>
- <a href="http://www.tl-dr.org/downloads/keen/official/keen1-1.31.zip">Download</a>
+ <a href= "http://www.tl-dr.org/downloads/keen/official/keen1-1.31.zip">Download</a>
</div>
</div>
- <div id = "footer" class = "containCentered">
+ <div id= "footer" class= "containCentered">
<h6>hosted by</h6>
- <a href="http://sourceforge.net" class = "centered">
- <img src = "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt="SourceForge.net Logo" height="37px" width="125px" />
+ <a href= "http://sourceforge.net" class= "centered">
+ <img src= "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt= "SourceForge.net Logo" height= "37" width= "125" />
</a>
- <p class = "centered">2011 Commander Genius is licensed under GPL</p>
- <a href="mailto:%20g...@gm..." class="baseline centered">by The Commander Genius Team</a>
+ <p class= "centered">2011 Commander Genius is licensed under GPL</p>
+ <a href= "mailto:ger...@gm..." class= "baseline centered">by The Commander Genius Team</a>
</div>
- <script type="text/javascript" src = "tracking.js"></script>
+ <script type= "text/javascript" src= "tracking.js"></script>
</body>
</html>
diff --git a/website/img/cgkeen4title-new.png b/website/img/cgkeen4title-new.png
new file mode 100644
index 0000000..480de94
Binary files /dev/null and b/website/img/cgkeen4title-new.png differ
diff --git a/website/img/cgkeen4title.png b/website/img/cgkeen4title.png
index a45246d..792bb45 100644
Binary files a/website/img/cgkeen4title.png and b/website/img/cgkeen4title.png differ
diff --git a/website/img/keen4play1.jpg b/website/img/keen4play1.jpg
new file mode 100644
index 0000000..6f86653
Binary files /dev/null and b/website/img/keen4play1.jpg differ
diff --git a/website/img/lampk2cg.png b/website/img/lampk2cg.png
new file mode 100644
index 0000000..b88defa
Binary files /dev/null and b/website/img/lampk2cg.png differ
diff --git a/website/img/lampk2db.png b/website/img/lampk2db.png
new file mode 100644
index 0000000..e0fd927
Binary files /dev/null and b/website/img/lampk2db.png differ
diff --git a/website/index.html b/website/index.html
index 3d2d7e0..da10757 100644
--- a/website/index.html
+++ b/website/index.html
@@ -1,73 +1,73 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns= "http://www.w3.org/1999/xhtml" xml:lang= "en" lang= "en">
<head>
<!-- Made by Gerstrong & FCTW -->
<title>Commander Genius Web-Site</title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <meta name="keywords" content="Keywords here" />
- <meta name="description" content="Description here" />
- <meta name="author" content="Gerhard Stein" />
+ <meta http-equiv= "Content-Type" content= "text/html; charset=iso-8859-1" />
+ <meta name= "keywords" content= "Keywords here" />
+ <meta name= "description" content= "Description here" />
+ <meta name= "author" content= "Gerhard Stein, Casey Bird" />
<!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
- <meta name="robots" content="index, follow" />
- <meta name="revisit-after" content="30 days" />
- <meta name="distribution" content="global" />
- <meta name="rating" content="general" />
- <meta name="Content-Language" content="english" />
- <link href="reset.css" rel="stylesheet" type="text/css" />
- <link href="main.css" rel="stylesheet" type="text/css" />
- <link rel="shortcut icon" href="img/favicon.ico" />
+ <meta name= "robots" content= "index, follow" />
+ <meta name= "revisit-after" content= "30 days" />
+ <meta name= "distribution" content= "global" />
+ <meta name= "rating" content= "general" />
+ <meta name= "Content-Language" content= "english" />
+ <link href= "reset.css" rel= "stylesheet" type= "text/css" />
+ <link href= "main.css" rel= "stylesheet" type= "text/css" />
+ <link rel= "shortcut icon" href= "favicon.ico" />
</head>
<body>
- <div id = "header">
- <img src = "img/toplogo.jpg" height="87px" width="342px" id = "headerImg" alt = "The Bean-With-Bacon" />
+ <div id= "header">
+ <img src= "img/toplogo.jpg" height= "87" width= "342" id= "headerImg" alt= "The Bean-With-Bacon" />
<ul>
- <li><a href="index.html" id = "indexLink" title = "Find out about us. (You know you want to.)">
- <img src = "img/buttonAbout.jpg" height = "20px" width = "120px" alt = "About Us" />
+ <li><a href= "index.html" id= "indexLink" title= "Find out about us. (You know you want to.)">
+ <img src= "img/buttonAbout.jpg" height= "40" width= "120" alt= "About Us" />
About Us</a></li>
- <li><a href="news.html" id = "newsLink" title = "Have you heard what's new?">
- <img src = "img/buttonNews.jpg" height = "20px" width = "120px" alt = "News" />
+ <li><a href= "news.html" id= "newsLink" title= "Have you heard what's new?">
+ <img src= "img/buttonNews.jpg" height= "40" width= "120" alt= "News" />
News</a></li>
- <li><a href="download.html" id = "downLink" title = "Get this fantastic interpreter.">
- <img src = "img/buttonDown.jpg" height = "20px" width = "120px" alt = "Download" />
+ <li><a href= "download.html" id= "downLink" title= "Get this fantastic interpreter.">
+ <img src= "img/buttonDown.jpg" height= "40" width= "120" alt= "Download" />
Download</a></li>
- <li><a href="http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id = "forumLink" title = "Drop by and say hello on our forum.">
- <img src = "img/buttonForum.jpg" height = "20px" width = "120px" alt = "Forum" />
+ <li><a href= "http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id= "forumLink" title= "Drop by and say hello on our forum.">
+ <img src= "img/buttonForum.jpg" height= "40" width= "120" alt= "Forum" />
Forum</a></li>
- <li><a href="doc/html/index.html" id = "docLink" title = "Delve into our documentation.">
- <img src = "img/buttonDoc.jpg" height = "20px" width = "120px" alt = "Documentation" />
+ <li><a href= "doc/html/index.html" id= "docLink" title= "Delve into our documentation.">
+ <img src= "img/buttonDoc.jpg" height= "40" width= "120" alt= "Documentation" />
Documentation</a></li>
- <li><a href="compat.html" id = "compatLink" title = "View the compatability chart.">
- <img src = "img/buttonCompat.jpg" height = "20px" width = "120px" alt = "Compatability Chart" />
+ <li><a href= "compat.html" id= "compatLink" title= "View the compatability chart.">
+ <img src= "img/buttonCompat.jpg" height= "40" width= "120" alt= "Compatability Chart" />
Compatability Chart</a></li>
- <li><a href="screens.html" id = "scrLink" title = "Checkout some screenshots of our project.">
- <img src = "img/buttonScr.jpg" height = "20px" width = "120px" alt = "Screenshots" />
+ <li><a href= "screens.html" id= "scrLink" title= "Checkout some screenshots of our project.">
+ <img src= "img/buttonScr.jpg" height= "40" width= "120" alt= "Screenshots" />
Screenshots</a></li>
- <li><a href="videos.html" id = "vidLink" title = "Drool over our spiffy videos.">
- <img src = "img/buttonVid.jpg" height = "20px" width = "120px" alt = "Videos" />
+ <li><a href= "videos.html" id= "vidLink" title= "Drool over our spiffy videos.">
+ <img src= "img/buttonVid.jpg" height= "40" width= "120" alt= "Videos" />
Videos</a></li>
- <li><a href="links.html" id = "linksLink" title = "See what else we think is cool.">
- <img src = "img/buttonLinks.jpg" height = "20px" width = "120px" alt = "Links" />
+ <li><a href= "links.html" id= "linksLink" title= "See what else we think is cool.">
+ <img src= "img/buttonLinks.jpg" height= "40" width= "120" alt= "Links" />
Links</a></li>
- <li><a href="http://sourceforge.net/apps/trac/clonekeenplus/" id = "tracLink" title = "Help us squash those nasty little bast--BUGS.">
- <img src = "img/buttonTrac.jpg" height = "20px" width = "120px" alt = "Trac" />
+ <li><a href= "http://sourceforge.net/apps/trac/clonekeenplus/" id= "tracLink" title= "Help us squash those nasty little bast--BUGS.">
+ <img src= "img/buttonTrac.jpg" height= "40" width= "120" alt= "Trac" />
Bug Tracker</a></li>
</ul>
</div>
- <div id = "sidebar">
- <img src = "img/mainpic1.jpg" height="157px" width="150px" alt = "Spot - The Yorp" />
+ <div id= "sidebar">
+ <img src= "img/mainpic1.jpg" height= "157" width= "150" alt= "Spot - The Yorp" />
<h6>Commander Keen on modern systems!</h6>
<p>Enjoy the old but good games with better graphics, sound and controls.</p>
<h6>Commander Keen 4-6!</h6>
<p>We are working hard to make Commander Genius compatible with the Galaxy games.</p>
- <a href="http://sourceforge.net/project/project_donations.php?group_id=249154">
- <img alt="Please support our project" height = "32px" width = "88px" src = "http://images.sourceforge.net/images/project-support.jpg" />
+ <a href= "http://sourceforge.net/project/project_donations.php?group_id=249154">
+ <img alt= "Please support our project" height= "32" width= "88" src= "http://images.sourceforge.net/images/project-support.jpg" />
</a>
</div>
- <div id = "mainContent">
- <div id = "intro">
+ <div id= "mainContent">
+ <div id= "intro">
<h1>Start/About</h1>
<h2>Welcome to Commander Genius</h2>
<p>
@@ -89,8 +89,8 @@
</p>
</div>
- <div id = "ourTeam">
- <div class = "fauxTable">
+ <div id= "ourTeam">
+ <div class= "fauxTable">
<h2>The Commander Genius Team</h2>
<p>These are the people who made all this magic possible.</p>
<ul>
@@ -113,7 +113,7 @@
</ul>
</div>
- <div class = "fauxTable">
+ <div class= "fauxTable">
<h2>Credits and special thanks to people who help us a lot:</h2>
<ul>
<li>James K. Beard</li>
@@ -138,7 +138,7 @@
</div>
</div>
- <div id = "note">
+ <div id= "note">
<p>
<strong>NOTE:</strong> We are currently looking for
fans of Commander Keen, developers, or artists who
@@ -146,7 +146,7 @@
a better interpreter for the Invasion of the Vorticons
Series (Also Galaxy series, Dreams, and mods) they are
more than welcome to help us. Just drop our project
- leader an Email at:<a href="mailto:ger...@gm...">
+ leader an Email at:<a href= "mailto:ger...@gm...">
ger...@gm...</a>
</p>
<p>
@@ -155,8 +155,8 @@
</p>
</div>
- <div id = "supportInfo">
- <img class = "floatLeft" height = "339px" width = "535px" alt="Commander Genius Keen4 - Galaxy" src = "img/keen4coming.png" />
+ <div id= "supportInfo">
+ <img class= "floatLeft" height= "339" width= "535" alt= "Commander Genius Keen4 - Galaxy" src= "img/keen4coming.png" />
<h3>Goodbye Galaxy and Keen Dreams support</h3>
<p>
We are working hard on the Commander Genius support
@@ -183,8 +183,8 @@
</p>
</div>
- <div id = "features">
- <img class = "floatLeft" height = "334px" width = "535px" alt="2 Player Keening" src = "img/keenvga1.jpg" />
+ <div id= "features">
+ <img class= "floatLeft" height= "334" width= "535" alt= "2 Player Keening" src= "img/keenvga1.jpg" />
<h3>Features</h3>
<ul>
<li>4 Player Mode</li>
@@ -211,11 +211,11 @@
</ul>
<p>Check it out today, it's free!</p>
- <a href="download.html">>> Go to the download page here!!</a>
+ <a href= "download.html">>> Go to the download page here!!</a>
</div>
- <div id = "improvement">
- <img class = "floatLeft" height = "333px" width = "535px" alt="Darkness" src = "img/keendark.jpg" />
+ <div id= "improvement">
+ <img class= "floatLeft" height= "333" width= "535" alt= "Darkness" src= "img/keendark.jpg" />
<p>
The right hand image that you see is Commander Keen in
a dark room when playing the game normally under DOS
@@ -227,13 +227,13 @@
</div>
</div>
- <div id = "footer" class = "containCentered">
+ <div id= "footer" class= "containCentered">
<h6>hosted by</h6>
- <a href="http://sourceforge.net" class = "centered">
- <img src = "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt="SourceForge.net Logo" height="37px" width="125px" />
+ <a href= "http://sourceforge.net" class= "centered">
+ <img src= "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt= "SourceForge.net Logo" height= "37" width= "125" />
</a>
<p class= "centered">2011 Commander Genius is licensed under GPL</p>
- <a href= "mailto:%20g...@gm..." class="baseline">by The Commander Genius Team</a>
+ <a href= "mailto:ger...@gm..." class= "baseline">by The Commander Genius Team</a>
</div>
<script type= "text/javascript" src= "tracking.js"></script>
diff --git a/website/links.html b/website/links.html
index 5132dfb..04d04c7 100644
--- a/website/links.html
+++ b/website/links.html
@@ -1,77 +1,77 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns= "http://www.w3.org/1999/xhtml" xml:lang= "en" lang= "en">
<head>
<!-- Made by Gerstrong & FCTW -->
<title>Commander Genius Web-Site</title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <meta name="keywords" content="Keywords here" />
- <meta name="description" content="Description here" />
- <meta name="author" content="Gerhard Stein" />
+ <meta http-equiv= "Content-Type" content= "text/html; charset=iso-8859-1" />
+ <meta name= "keywords" content= "Keywords here" />
+ <meta name= "description" content= "Description here" />
+ <meta name= "author" content= "Gerhard Stein, Casey Bird" />
<!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
- <meta name="robots" content="index, follow" />
- <meta name="revisit-after" content="30 days" />
- <meta name="distribution" content="global" />
- <meta name="rating" content="general" />
- <meta name="Content-Language" content="english" />
- <link href="reset.css" rel="stylesheet" type="text/css" />
- <link href="main.css" rel="stylesheet" type="text/css" />
- <link rel="shortcut icon" href="img/favicon.ico" />
+ <meta name= "robots" content= "index, follow" />
+ <meta name= "revisit-after" content= "30 days" />
+ <meta name= "distribution" content= "global" />
+ <meta name= "rating" content= "general" />
+ <meta name= "Content-Language" content= "english" />
+ <link href= "reset.css" rel= "stylesheet" type= "text/css" />
+ <link href= "main.css" rel= "stylesheet" type= "text/css" />
+ <link rel= "shortcut icon" href= "favicon.ico" />
</head>
<body>
- <div id = "header">
- <img src = "img/toplogo.jpg" height="87px" width="342px" id = "headerImg" alt = "The Bean-With-Bacon" />
+ <div id= "header">
+ <img src= "img/toplogo.jpg" height= "87" width= "342" id= "headerImg" alt= "The Bean-With-Bacon" />
<ul>
- <li><a href="index.html" id = "indexLink" title = "Find out about us. (You know you want to.)">
- <img src = "img/buttonAbout.jpg" height = "20px" width = "120px" alt = "About Us" />
+ <li><a href= "index.html" id= "indexLink" title= "Find out about us. (You know you want to.)">
+ <img src= "img/buttonAbout.jpg" height= "40" width= "120" alt= "About Us" />
About Us</a></li>
- <li><a href="news.html" id = "newsLink" title = "Have you heard what's new?">
- <img src = "img/buttonNews.jpg" height = "20px" width = "120px" alt = "News" />
+ <li><a href= "news.html" id= "newsLink" title= "Have you heard what's new?">
+ <img src= "img/buttonNews.jpg" height= "40" width= "120" alt= "News" />
News</a></li>
- <li><a href="download.html" id = "downLink" title = "Get this fantastic interpreter.">
- <img src = "img/buttonDown.jpg" height = "20px" width = "120px" alt = "Download" />
+ <li><a href= "download.html" id= "downLink" title= "Get this fantastic interpreter.">
+ <img src= "img/buttonDown.jpg" height= "40" width= "120" alt= "Download" />
Download</a></li>
- <li><a href="http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id = "forumLink" title = "Drop by and say hello on our forum.">
- <img src = "img/buttonForum.jpg" height = "20px" width = "120px" alt = "Forum" />
+ <li><a href= "http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id= "forumLink" title= "Drop by and say hello on our forum.">
+ <img src= "img/buttonForum.jpg" height= "40" width= "120" alt= "Forum" />
Forum</a></li>
- <li><a href="doc/html/index.html" id = "docLink" title = "Delve into our documentation.">
- <img src = "img/buttonDoc.jpg" height = "20px" width = "120px" alt = "Documentation" />
+ <li><a href= "doc/html/index.html" id= "docLink" title= "Delve into our documentation.">
+ <img src= "img/buttonDoc.jpg" height= "40" width= "120" alt= "Documentation" />
Documentation</a></li>
- <li><a href="compat.html" id = "compatLink" title = "View the compatability chart.">
- <img src = "img/buttonCompat.jpg" height = "20px" width = "120px" alt = "Compatability Chart" />
+ <li><a href= "compat.html" id= "compatLink" title= "View the compatability chart.">
+ <img src= "img/buttonCompat.jpg" height= "40" width= "120" alt= "Compatability Chart" />
Compatability Chart</a></li>
- <li><a href="screens.html" id = "scrLink" title = "Checkout some screenshots of our project.">
- <img src = "img/buttonScr.jpg" height = "20px" width = "120px" alt = "Screenshots" />
+ <li><a href= "screens.html" id= "scrLink" title= "Checkout some screenshots of our project.">
+ <img src= "img/buttonScr.jpg" height= "40" width= "120" alt= "Screenshots" />
Screenshots</a></li>
- <li><a href="videos.html" id = "vidLink" title = "Drool over our spiffy videos.">
- <img src = "img/buttonVid.jpg" height = "20px" width = "120px" alt = "Videos" />
+ <li><a href= "videos.html" id= "vidLink" title= "Drool over our spiffy videos.">
+ <img src= "img/buttonVid.jpg" height= "40" width= "120" alt= "Videos" />
Videos</a></li>
- <li><a href="links.html" id = "linksLink" title = "See what else we think is cool.">
- <img src = "img/buttonLinks.jpg" height = "20px" width = "120px" alt = "Links" />
+ <li><a href= "links.html" id= "linksLink" title= "See what else we think is cool.">
+ <img src= "img/buttonLinks.jpg" height= "40" width= "120" alt= "Links" />
Links</a></li>
- <li><a href="http://sourceforge.net/apps/trac/clonekeenplus/" id = "tracLink" title = "Help us squash those nasty little bast--BUGS.">
- <img src = "img/buttonTrac.jpg" height = "20px" width = "120px" alt = "Trac" />
+ <li><a href= "http://sourceforge.net/apps/trac/clonekeenplus/" id= "tracLink" title= "Help us squash those nasty little bast--BUGS.">
+ <img src= "img/buttonTrac.jpg" height= "40" width= "120" alt= "Trac" />
Bug Tracker</a></li>
</ul>
</div>
- <div id = "sidebar">
- <img src = "img/nessiegreet.jpg" height="157px" width="150px" alt = "Keen and Messie" />
+ <div id= "sidebar">
+ <img src= "img/nessiegreet.jpg" height= "157" width= "150" alt= "Keen and Messie" />
<h6>Commander Keen on modern systems!</h6>
<p>Enjoy the old but good games with better graphics, sound and controls.</p>
<h6>Commander Keen 4-6!</h6>
<p>We are working hard to make Commander Genius compatible with the Galaxy games.</p>
- <a href="http://sourceforge.net/project/project_donations.php?group_id=249154">
- <img alt="Please support our project" height = "32px" width = "88px" src = "http://images.sourceforge.net/images/project-support.jpg" />
+ <a href= "http://sourceforge.net/project/project_donations.php?group_id=249154">
+ <img alt= "Please support our project" height= "32" width= "88" src= "http://images.sourceforge.net/images/project-support.jpg" />
</a>
</div>
- <div id = "mainContent">
+ <div id= "mainContent">
<div></div>
<h1>Links</h1>
<div></div>
- <a href="http://clonekeenplus.neejean.org/">Commander Genius Official Forum</a>
+ <a href= "http://clonekeenplus.neejean.org/">Commander Genius Official Forum</a>
<p>
This Forum is for users, testers, designers, composers and
developers of Commander Genius. We are always happy to greet
@@ -80,7 +80,7 @@
</p>
<div></div>
- <a href="http://www.pckf.com/">Public Commander Keen Forum</a>
+ <a href= "http://www.pckf.com/">Public Commander Keen Forum</a>
<p>
Our favorite forum. You can find us all here and discuss
about several topics around the Keen games. This Site helped
@@ -88,37 +88,37 @@
</p>
<div></div>
- <a href="http://www.shikadi.net/keenwiki/Main_Page">Commander Keen Wiki</a>
+ <a href= "http://www.shikadi.net/keenwiki/Main_Page">Commander Keen Wiki</a>
<p>Nice site with information about the Commander Keen Games.</p>
<div></div>
- <a href="http://www.shikadi.net/moddingwiki/Main_Page">Game Modding Wiki</a>
+ <a href= "http://www.shikadi.net/moddingwiki/Main_Page">Game Modding Wiki</a>
<p>
All the file format structures of some old DOS Games like
Commander Keen.
</p>
<div></div>
- <a href="http://dl.openhandhelds.org/cgi-bin/wiz.cgi">OpenHandhelds Wiz Archive</a>
+ <a href= "http://dl.openhandhelds.org/cgi-bin/wiz.cgi">OpenHandhelds Wiz Archive</a>
<p>Power for your wiz device!</p>
<div></div>
- <a href="http://davince.tengudev.com/">DaVince's Website</a>
+ <a href= "http://davince.tengudev.com/">DaVince's Website</a>
<p>
Nice website of a great fan of Commander Keen and good
artist. It has some games, a blog and much more.
</p>
</div>
- <div id = "footer" class = "containCentered">
+ <div id= "footer" class= "containCentered">
<h6>hosted by</h6>
- <a href="http://sourceforge.net" class = "centered">
- <img src = "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt="SourceForge.net Logo" height="37px" width="125px" />
+ <a href= "http://sourceforge.net" class= "centered">
+ <img src= "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt= "SourceForge.net Logo" height= "37" width= "125" />
</a>
- <p class = "centered">2011 Commander Genius is licensed under GPL</p>
- <a href="mailto:%20g...@gm..." class="baseline centered">by The Commander Genius Team</a>
+ <p class= "centered">2011 Commander Genius is licensed under GPL</p>
+ <a href= "mailto:ger...@gm..." class= "baseline centered">by The Commander Genius Team</a>
</div>
- <script type="text/javascript" src = "tracking.js"></script>
+ <script type= "text/javascript" src= "tracking.js"></script>
</body>
</html>
diff --git a/website/main.css b/website/main.css
index 7973f65..793c2bf 100644
--- a/website/main.css
+++ b/website/main.css
@@ -116,16 +116,15 @@ td, th {
}
#header #headerImg {
+ float: left;
padding: 0.45em;
- width: auto;
height: 5.43em;
- float: left;
}
#header ul {
+ width: 600px;
float: left;
margin: 1.87em 1.5em 0;
- width: 600px;
}
#header li {
@@ -134,9 +133,9 @@ td, th {
text-indent: -187em;
font: 0/0 Arial;
overflow: hidden;
- color: rgba(255,255,255,0);
+ color: rgba( 255, 255, 255 ,0 );
vertical-align: bottom;
- }
+}
#header li a {
width: 120px;
diff --git a/website/news.html b/website/news.html
index 4c06bd1..28ef0a9 100644
--- a/website/news.html
+++ b/website/news.html
@@ -1,68 +1,68 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns= "http://www.w3.org/1999/xhtml" xml:lang= "en" lang= "en">
<head>
<!-- Made by Gerstrong & FCTW -->
<title>Commander Genius Web-Site</title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <meta name="keywords" content="Keywords here" />
- <meta name="description" content="Description here" />
- <meta name="author" content="Gerhard Stein" />
+ <meta http-equiv= "Content-Type" content= "text/html; charset=iso-8859-1" />
+ <meta name= "keywords" content= "Keywords here" />
+ <meta name= "description" content= "Description here" />
+ <meta name= "author" content= "Gerhard Stein, Casey Bird" />
<!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
- <meta name="robots" content="index, follow" />
- <meta name="revisit-after" content="30 days" />
- <meta name="distribution" content="global" />
- <meta name="rating" content="general" />
- <meta name="Content-Language" content="english" />
- ...
[truncated message content] |
|
From: Casey B. <fc...@us...> - 2011-12-20 21:58:20
|
via c54055c13e83bad15964f224ed88161ee9be84d8 (commit)
from 2a1fd4ff6a32e3bee27c2fb911035cae1ba5fdbb (commit)
- Log -----------------------------------------------------------------
commit c54055c13e83bad15964f224ed88161ee9be84d8
Author: Casey Bird <FromCrimsonToWool+SourceTree@Gmail.com>
Date: Tue Dec 20 16:56:54 2011 -0500
-Same as last commit applied to every page
-----------------------------------------------------------------------
Summary of changes:
website/compat.html | 272 +++++++++++++++---------------
website/download.html | 438 ++++++++++++++++++++++++------------------------
website/index.html | 6 +-
website/links.html | 222 ++++++++++++-------------
website/news.html | 440 ++++++++++++++++++++++++-------------------------
website/screens.html | 332 ++++++++++++++++++-------------------
website/videos.html | 296 ++++++++++++++++-----------------
7 files changed, 997 insertions(+), 1009 deletions(-)
diff --git a/website/compat.html b/website/compat.html
index 671e9da..c14fda2 100644
--- a/website/compat.html
+++ b/website/compat.html
@@ -1,149 +1,147 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <!-- Made by Gerstrong & FCTW -->
- <title>Commander Genius Web-Site</title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <meta name="keywords" content="Keywords here" />
- <meta name="description" content="Description here" />
- <meta name="author" content="Gerhard Stein" />
- <!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
- <meta name="robots" content="index, follow" />
- <meta name="revisit-after" content="30 days" />
- <meta name="distribution" content="global" />
- <meta name="rating" content="general" />
- <meta name="Content-Language" content="english" />
- <link href="reset.css" rel="stylesheet" type="text/css" />
- <link href="main.css" rel="stylesheet" type="text/css" />
- <link rel="shortcut icon" href="img/favicon.ico" />
- </head>
+ <head>
+ <!-- Made by Gerstrong & FCTW -->
+ <title>Commander Genius Web-Site</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ <meta name="keywords" content="Keywords here" />
+ <meta name="description" content="Description here" />
+ <meta name="author" content="Gerhard Stein" />
+ <!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
+ <meta name="robots" content="index, follow" />
+ <meta name="revisit-after" content="30 days" />
+ <meta name="distribution" content="global" />
+ <meta name="rating" content="general" />
+ <meta name="Content-Language" content="english" />
+ <link href="reset.css" rel="stylesheet" type="text/css" />
+ <link href="main.css" rel="stylesheet" type="text/css" />
+ <link rel="shortcut icon" href="img/favicon.ico" />
+ </head>
- <body>
- <div id = "header">
- <img src = "img/toplogo.jpg" height="87px" width="342px" id = "headerImg" alt = "The Bean-With-Bacon" />
- <ul>
- <li><a href="index.html" id = "indexLink" title = "Find out about us. (You know you want to.)">
- <img src = "img/buttonAbout.jpg" height = "20px" width = "120px" alt = "About Us" />
- About Us</a></li>
- <li><a href="news.html" id = "newsLink" title = "Have you heard what's new?">
- <img src = "img/buttonNews.jpg" height = "20px" width = "120px" alt = "News" />
- News</a></li>
- <li><a href="download.html" id = "downLink" title = "Get this fantastic interpreter.">
- <img src = "img/buttonDown.jpg" height = "20px" width = "120px" alt = "Download" />
- Download</a></li>
- <li><a href="http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id = "forumLink" title = "Drop by and say hello on our forum.">
- <img src = "img/buttonForum.jpg" height = "20px" width = "120px" alt = "Forum" />
- Forum</a></li>
- <li><a href="doc/html/index.html" id = "docLink" title = "Delve into our documentation.">
- <img src = "img/buttonDoc.jpg" height = "20px" width = "120px" alt = "Documentation" />
- Documentation</a></li>
- </ul>
- <ul id = "secondLine">
- <li><a href="compat.html" id = "compatLink" title = "View the compatability chart.">
- <img src = "img/buttonCompat.jpg" height = "20px" width = "120px" alt = "Compatability Chart" />
- Compatability Chart</a></li>
- <li><a href="screens.html" id = "scrLink" title = "Checkout some screenshots of our project.">
- <img src = "img/buttonScr.jpg" height = "20px" width = "120px" alt = "Screenshots" />
- Screenshots</a></li>
- <li><a href="videos.html" id = "vidLink" title = "Drool over our spiffy videos.">
- <img src = "img/buttonVid.jpg" height = "20px" width = "120px" alt = "Videos" />
- Videos</a></li>
- <li><a href="links.html" id = "linksLink" title = "See what else we think is cool.">
- <img src = "img/buttonLinks.jpg" height = "20px" width = "120px" alt = "Links" />
- Links</a></li>
- <li><a href="http://sourceforge.net/apps/trac/clonekeenplus/" id = "tracLink" title = "Help us squash those nasty little bast--BUGS.">
- <img src = "img/buttonTrac.jpg" height = "20px" width = "120px" alt = "Trac" />
- Bug Tracker</a></li>
- </ul>
- </div>
+ <body>
+ <div id = "header">
+ <img src = "img/toplogo.jpg" height="87px" width="342px" id = "headerImg" alt = "The Bean-With-Bacon" />
+ <ul>
+ <li><a href="index.html" id = "indexLink" title = "Find out about us. (You know you want to.)">
+ <img src = "img/buttonAbout.jpg" height = "20px" width = "120px" alt = "About Us" />
+ About Us</a></li>
+ <li><a href="news.html" id = "newsLink" title = "Have you heard what's new?">
+ <img src = "img/buttonNews.jpg" height = "20px" width = "120px" alt = "News" />
+ News</a></li>
+ <li><a href="download.html" id = "downLink" title = "Get this fantastic interpreter.">
+ <img src = "img/buttonDown.jpg" height = "20px" width = "120px" alt = "Download" />
+ Download</a></li>
+ <li><a href="http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id = "forumLink" title = "Drop by and say hello on our forum.">
+ <img src = "img/buttonForum.jpg" height = "20px" width = "120px" alt = "Forum" />
+ Forum</a></li>
+ <li><a href="doc/html/index.html" id = "docLink" title = "Delve into our documentation.">
+ <img src = "img/buttonDoc.jpg" height = "20px" width = "120px" alt = "Documentation" />
+ Documentation</a></li>
+ <li><a href="compat.html" id = "compatLink" title = "View the compatability chart.">
+ <img src = "img/buttonCompat.jpg" height = "20px" width = "120px" alt = "Compatability Chart" />
+ Compatability Chart</a></li>
+ <li><a href="screens.html" id = "scrLink" title = "Checkout some screenshots of our project.">
+ <img src = "img/buttonScr.jpg" height = "20px" width = "120px" alt = "Screenshots" />
+ Screenshots</a></li>
+ <li><a href="videos.html" id = "vidLink" title = "Drool over our spiffy videos.">
+ <img src = "img/buttonVid.jpg" height = "20px" width = "120px" alt = "Videos" />
+ Videos</a></li>
+ <li><a href="links.html" id = "linksLink" title = "See what else we think is cool.">
+ <img src = "img/buttonLinks.jpg" height = "20px" width = "120px" alt = "Links" />
+ Links</a></li>
+ <li><a href="http://sourceforge.net/apps/trac/clonekeenplus/" id = "tracLink" title = "Help us squash those nasty little bast--BUGS.">
+ <img src = "img/buttonTrac.jpg" height = "20px" width = "120px" alt = "Trac" />
+ Bug Tracker</a></li>
+ </ul>
+ </div>
- <div id = "sidebar">
- <img src = "img/lastlvlep1.jpg" height="157px" width="150px" alt = "Spot - The Yorp" />
- <h6>Commander Keen on modern systems!</h6>
- <p>Enjoy the old but good games with better graphics, sound and controls.</p>
- <h6>Commander Keen 4-6!</h6>
- <p>We are working hard to make Commander Genius compatible with the Galaxy games.</p>
- <a href="http://sourceforge.net/project/project_donations.php?group_id=249154">
- <img alt="Please support our project" height = "32px" width = "88px" src = "http://images.sourceforge.net/images/project-support.jpg" />
- </a>
- </div>
+ <div id = "sidebar">
+ <img src = "img/lastlvlep1.jpg" height="157px" width="150px" alt = "Spot - The Yorp" />
+ <h6>Commander Keen on modern systems!</h6>
+ <p>Enjoy the old but good games with better graphics, sound and controls.</p>
+ <h6>Commander Keen 4-6!</h6>
+ <p>We are working hard to make Commander Genius compatible with the Galaxy games.</p>
+ <a href="http://sourceforge.net/project/project_donations.php?group_id=249154">
+ <img alt="Please support our project" height = "32px" width = "88px" src = "http://images.sourceforge.net/images/project-support.jpg" />
+ </a>
+ </div>
- <div id = "mainContent">
- <div></div>
- <h1>Compatibilty Chart</h1>
- <p>This section shows the compatibility of the games, and what problems have been detected so far:</p>
+ <div id = "mainContent">
+ <div></div>
+ <h1>Compatibilty Chart</h1>
+ <p>This section shows the compatibility of the games, and what problems have been detected so far:</p>
- <table>
- <tr>
- <th>Game</td>
- <th>Compatibility/Completness</td>
- <th>Known issues</td>
- </tr>
- <tr>
- <td>Commander Keen: Marooned on Mars</td>
- <td>95 %</td>
- <td><ul><li>minor issues</li></ul></td>
- </tr>
- <tr>
- <td>Commander Keen: Invasion of the Vorticons</td>
- <td>85 %</td>
- <td><ul><li>minor issues</li></ul></td>
- </tr>
- <tr>
- <td>Commander Keen: Keen Must Die</td>
- <td>85 %</td>
- <td><ul><li>minor issues</li></ul></td>
- </tr>
- <tr>
- <td>Keen Dreams</td>
- <td>0 %</td>
- <td></td>
- </tr>
- <tr>
- <td>Commander Keen: Secret of the Oracle</td>
- <td>10 %</td>
- <td><ul><li>
- Keen can walk on the world map.
- Menu works, but that's all
- </li></ul></td>
- </tr>
- <tr>
- <td>Commander Keen Episode 5</td>
- <td>0 %</td>
- <td></td>
- </tr>
- <tr>
- <td>Commander Keen Episode 6</td>
- <td>0 %</td>
- <td></td>
- </tr>
- </table>
+ <table>
+ <tr>
+ <th>Game</th>
+ <th>Compatibility/Completness</th>
+ <th>Known issues</th>
+ </tr>
+ <tr>
+ <td>Commander Keen: Marooned on Mars</td>
+ <td>95 %</td>
+ <td><ul><li>minor issues</li></ul></td>
+ </tr>
+ <tr>
+ <td>Commander Keen: Invasion of the Vorticons</td>
+ <td>85 %</td>
+ <td><ul><li>minor issues</li></ul></td>
+ </tr>
+ <tr>
+ <td>Commander Keen: Keen Must Die</td>
+ <td>85 %</td>
+ <td><ul><li>minor issues</li></ul></td>
+ </tr>
+ <tr>
+ <td>Keen Dreams</td>
+ <td>0 %</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>Commander Keen: Secret of the Oracle</td>
+ <td>10 %</td>
+ <td><ul><li>
+ Keen can walk on the world map.
+ Menu works, but that's all
+ </li></ul></td>
+ </tr>
+ <tr>
+ <td>Commander Keen Episode 5</td>
+ <td>0 %</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>Commander Keen Episode 6</td>
+ <td>0 %</td>
+ <td></td>
+ </tr>
+ </table>
- <h1>Mods</h1>
- <p>
- Yeah, that's another situation and question. Some mods already work,
- and also some special ones as CG can read Patch code. It does not work
- everything in some of them, but many are supported. Just test it and
- let us know, if something has to be fixed to get the mod working
- correctly.
- </p>
+ <h1>Mods</h1>
+ <p>
+ Yeah, that's another situation and question. Some mods already work,
+ and also some special ones as CG can read Patch code. It does not work
+ everything in some of them, but many are supported. Just test it and
+ let us know, if something has to be fixed to get the mod working
+ correctly.
+ </p>
- <p>
- Tulip (Martin Hauber) created a special page where he tested those. Check it out!
- </p>
+ <p>
+ Tulip (Martin Hauber) created a special page where he tested those. Check it out!
+ </p>
- <a style="font-weight: bold;" href="http://www.shikadi.net/keenwiki/Commander_Genius">Commander Genius Wiki Page</a>
- </div>
+ <a style="font-weight: bold;" href="http://www.shikadi.net/keenwiki/Commander_Genius">Commander Genius Wiki Page</a>
+ </div>
- <div id = "footer" class = "containCentered">
- <h6>hosted by</h6>
- <a href="http://sourceforge.net" class = "centered">
- <img src = "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt="SourceForge.net Logo" height="37px" width="125px" />
- </a>
- <p class = "centered">2011 Commander Genius is licensed under GPL</p>
- <a href="mailto:%20g...@gm..." class="baseline" class = "centered">by The Commander Genius Team</a>
- </div>
+ <div id = "footer" class = "containCentered">
+ <h6>hosted by</h6>
+ <a href="http://sourceforge.net" class = "centered">
+ <img src = "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt="SourceForge.net Logo" height="37px" width="125px" />
+ </a>
+ <p class = "centered">2011 Commander Genius is licensed under GPL</p>
+ <a href="mailto:%20g...@gm..." class="baseline centered">by The Commander Genius Team</a>
+ </div>
- <script type="text/javascript" src = "tracking.js"></script>
- </body>
+ <script type="text/javascript" src = "tracking.js"></script>
+ </body>
</html>
diff --git a/website/download.html b/website/download.html
index 5f72efa..1a09af6 100644
--- a/website/download.html
+++ b/website/download.html
@@ -1,223 +1,221 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <!-- Made by Gerstrong & FCTW -->
- <title>Commander Genius Web-Site</title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <meta name="keywords" content="Keywords here" />
- <meta name="description" content="Description here" />
- <meta name="author" content="Gerhard Stein" />
- <!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
- <meta name="robots" content="index, follow" />
- <meta name="revisit-after" content="30 days" />
- <meta name="distribution" content="global" />
- <meta name="rating" content="general" />
- <meta name="Content-Language" content="english" />
- <link href="reset.css" rel="stylesheet" type="text/css" />
- <link href="main.css" rel="stylesheet" type="text/css" />
- <link rel="shortcut icon" href="img/favicon.ico" />
- </head>
-
- <body>
- <div id = "header">
- <img src = "img/toplogo.jpg" height="87px" width="342px" id = "headerImg" alt = "The Bean-With-Bacon" />
- <ul>
- <li><a href="index.html" id = "indexLink" title = "Find out about us. (You know you want to.)">
- <img src = "img/buttonAbout.jpg" height = "20px" width = "120px" alt = "About Us" />
- About Us</a></li>
- <li><a href="news.html" id = "newsLink" title = "Have you heard what's new?">
- <img src = "img/buttonNews.jpg" height = "20px" width = "120px" alt = "News" />
- News</a></li>
- <li><a href="download.html" id = "downLink" title = "Get this fantastic interpreter.">
- <img src = "img/buttonDown.jpg" height = "20px" width = "120px" alt = "Download" />
- Download</a></li>
- <li><a href="http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id = "forumLink" title = "Drop by and say hello on our forum.">
- <img src = "img/buttonForum.jpg" height = "20px" width = "120px" alt = "Forum" />
- Forum</a></li>
- <li><a href="doc/html/index.html" id = "docLink" title = "Delve into our documentation.">
- <img src = "img/buttonDoc.jpg" height = "20px" width = "120px" alt = "Documentation" />
- Documentation</a></li>
- </ul>
- <ul id = "secondLine">
- <li><a href="compat.html" id = "compatLink" title = "View the compatability chart.">
- <img src = "img/buttonCompat.jpg" height = "20px" width = "120px" alt = "Compatability Chart" />
- Compatability Chart</a></li>
- <li><a href="screens.html" id = "scrLink" title = "Checkout some screenshots of our project.">
- <img src = "img/buttonScr.jpg" height = "20px" width = "120px" alt = "Screenshots" />
- Screenshots</a></li>
- <li><a href="videos.html" id = "vidLink" title = "Drool over our spiffy videos.">
- <img src = "img/buttonVid.jpg" height = "20px" width = "120px" alt = "Videos" />
- Videos</a></li>
- <li><a href="links.html" id = "linksLink" title = "See what else we think is cool.">
- <img src = "img/buttonLinks.jpg" height = "20px" width = "120px" alt = "Links" />
- Links</a></li>
- <li><a href="http://sourceforge.net/apps/trac/clonekeenplus/" id = "tracLink" title = "Help us squash those nasty little bast--BUGS.">
- <img src = "img/buttonTrac.jpg" height = "20px" width = "120px" alt = "Trac" />
- Bug Tracker</a></li>
- </ul>
- </div>
-
- <div id = "sidebar">
- <img src = "img/paris.jpg" height="157px" width="150px" title = "Paris... Why bother saving it?" alt = "Paris... Why bother saving it?" />
- <h6>Commander Keen on modern systems!</h6>
- <p>Enjoy the old but good games with better graphics, sound and controls.</p>
- <h6>Commander Keen 4-6!</h6>
- <p>We are working hard to make Commander Genius compatible with the Galaxy games.</p>
- <a href="http://sourceforge.net/project/project_donations.php?group_id=249154">
- <img alt="Please support our project" height = "32px" width = "88px" src = "http://images.sourceforge.net/images/project-support.jpg" />
- </a>
- </div>
-
- <div id = "mainContent">
- <div id = "intro">
- <h1>Downloads</h1>
- <p>
- We have the interpreter for different operating systems and
- devices. Select your system and you are off to play!
- </p>
- </div>
-
- <div id = "platforms">
- <img class = "floatLeft" width = "420px" height = "323px" alt="CKP02ans" src = "img/presenv03cg.png" />
- <h1>Commander Genius Platforms</h1>
-
- <p>
- <img width = "32px" height = "30px" alt="Win7" src = "img/win7.png" />
- Windows (98, ME, 2000, XP, Vista, 7 and others) - Version 0.3.7 -
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-WIN32.exe/download">Installer (32 bit)</a>
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-WIN32.zip/download">ZIP Package (32 bit)</a>
-
- </p>
-
- <p>
- <img width = "44px" height = "48px" alt="Linux" src = "img/linux.jpg" />
- Linux (Binary only) - Version 0.3.7 -
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-i386.tar.gz/download">32-bit</a>
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-amd64.tar.gz/download">64-bit</a>
- </p>
-
- <p>
- <img width = "48px" height = "44px" alt="Linux" src = "img/ubuntu.jpg" />
- Ubuntu Linux (11.04 and higher recommended) and Debian based distros - Version 0.3.7 -
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-i386.deb/download">32-bit</a>
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-amd64.deb/download">64-bit</a>
- </p>
-
- <p>
- <img width = "48px" height = "44px" alt="Linux" src = "img/fedorasuse.png" />
- Fedora (15+) or OpenSuse (11.4+) and RPM based distros - Version 0.3.7 -
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-i386.rpm/download">32-bit</a>
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-amd64.rpm/download">64-bit</a>
- </p>
-
- <p>
- <img width = "43px" height = "40px" alt="MacOsX" src = "img/macosx.jpg" />
- MacOS X (10.3 and later) - v0.3.5 -
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.5/CGenius-0.3.5-Mac.dmg/download">Universal</a>
- </p>
-
- <p>
- <img width = "43px" height = "48px" alt="GP2X" src = "img/iphonewallet.jpg" />
- iPhone - Commander Genius v0.3.2.x - (Still under construction)
- </p>
-
- <p>
- <img width = "39px" height = "64px" alt="Android" src = "img/google-android.jpg" />
- Google Android Devices
- <a href="http://www.androidpit.com/en/android/market/apps/app/net.sourceforge.clonekeenplus/Commander-Genius">Commander Genius 0.3.2.x</a>
- </p>
-
- <p>
- <img width = "60px" height = "48px" alt="GP2X" src = "img/gp2x.jpg" />
- Open Handhelds
- <a href="http://dl.openhandhelds.org/cgi-bin/gp2x.cgi?0,0,0,0,20,2832">Commander Genius (GP2X) [0.3.2.6]</a>
- <a href="http://dl.openhandhelds.org/cgi-bin/wiz.cgi?0,0,0,0,35,55">Commander Genius (Wiz) [0.3.2.6]</a>
- <a href="http://dl.openhandhelds.org/cgi-bin/pandora.cgi?0,0,0,0,35,50">Commander Genius (Pandora) [0.3.2.6]</a>
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.2.x/cgenius-dingoo-r2.tar.bz2/download">Commander Genius (Dingoo) [0.3.2.6]</a>
- </p>
-
- <h1>Get the latest source code via GIT</h1>
-
- <p>
- All current versions are now stable, this doesn't mean perfect, just
- good enough. The stable version is
- known to work on most of the systems and has been tested deeper. The
- Prereleases are known to be stable too, but with minor issues.
- </p>
-
- <p>
- You can also browse through the Sourceforge.net packages <a href="https://sourceforge.net/project/showfiles.php?group_id=249154">here</a>.
- They may not be the most stable versions, but they are more recent. If
- you find bugs in them we would be happy if you report
- them to us so we can improve Commander Genius.
- </p>
-
- <p>
- If you want the most recent source code you can also download it per GIT <a href="http://sourceforge.net/scm/?type=git&group_id=249154">here</a>
- </p>
-
- <h1>Bugs found?</h1>
- <p>
- We are happy to see people who test our product. If you want to report bugs, you can
- do that <a href="http://sourceforge.net/apps/trac/clonekeenplus/">here</a>. This is mainly used by our developers but
- can be used by everybody.
- </p>
-
- <a href="http://sourceforge.net/apps/trac/clonekeenplus/">Trac</a>
- </div>
-
- <div id = "highQualityPack">
- <img class = "floatLeft" width = "425px" height = "296px" alt="HQP" src = "img/HQP1.png" />
- <h1>High Quality Pack (HQP)</h1>
-
- <p>
- The High Quality Pack provides extra resources for Commander
- Genius like music and extra sound effects and svga graphics. When
- installed, you can hear music in the first episode of the game. High
- quality SVGA tilesets have been added to Episode 1 & 2.
- More is about to come!
- </p>
- <p>Try it out! It really makes an old game look great!</p>
-
- <a href="http://sourceforge.net/projects/clonekeenplus/files/High%20Quality%20Packs/Version%201.x/hqpv18.zip/download">Download</a>
-
- <h1>Tools around Commander Genius</h1>
- <p>
- Here are some tools and other Code we have been
- building up to support more games and introduce new
- features.
- </p>
-
- <p>
- Take a look at the directory
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Tools/">here</a>
- </p>
- </div>
-
- <div id = "K1">
- <img class = "floatLeft" width = "422px" height = "262px" alt="Commander Keen 1" src = "img/keen1title.gif" />
- <h1>Commander Keen Episode 1: "Marooned on Mars"</h1>
- <p>
- If you don't own any Commander Keen game, you will need
- one to get the interpreter run. If you own one or the
- trilogy, you can use them. This is the original
- DOS-Version of Commander Keen Episode 1 (Shareware).
- The bundle versions have included this episode already,
- so no download needed for those.
- </p>
- <a href="http://www.tl-dr.org/downloads/keen/official/keen1-1.31.zip">Download</a>
- </div>
- </div>
-
- <div id = "footer" class = "containCentered">
- <h6>hosted by</h6>
- <a href="http://sourceforge.net" class = "centered">
- <img src = "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt="SourceForge.net Logo" height="37px" width="125px" />
- </a>
- <p class = "centered">2011 Commander Genius is licensed under GPL</p>
- <a href="mailto:%20g...@gm..." class="baseline" class = "centered">by The Commander Genius Team</a>
- </div>
-
- <script type="text/javascript" src = "tracking.js"></script>
- </body>
+ <head>
+ <!-- Made by Gerstrong & FCTW -->
+ <title>Commander Genius Web-Site</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ <meta name="keywords" content="Keywords here" />
+ <meta name="description" content="Description here" />
+ <meta name="author" content="Gerhard Stein" />
+ <!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
+ <meta name="robots" content="index, follow" />
+ <meta name="revisit-after" content="30 days" />
+ <meta name="distribution" content="global" />
+ <meta name="rating" content="general" />
+ <meta name="Content-Language" content="english" />
+ <link href="reset.css" rel="stylesheet" type="text/css" />
+ <link href="main.css" rel="stylesheet" type="text/css" />
+ <link rel="shortcut icon" href="img/favicon.ico" />
+ </head>
+
+ <body>
+ <div id = "header">
+ <img src = "img/toplogo.jpg" height="87px" width="342px" id = "headerImg" alt = "The Bean-With-Bacon" />
+ <ul>
+ <li><a href="index.html" id = "indexLink" title = "Find out about us. (You know you want to.)">
+ <img src = "img/buttonAbout.jpg" height = "20px" width = "120px" alt = "About Us" />
+ About Us</a></li>
+ <li><a href="news.html" id = "newsLink" title = "Have you heard what's new?">
+ <img src = "img/buttonNews.jpg" height = "20px" width = "120px" alt = "News" />
+ News</a></li>
+ <li><a href="download.html" id = "downLink" title = "Get this fantastic interpreter.">
+ <img src = "img/buttonDown.jpg" height = "20px" width = "120px" alt = "Download" />
+ Download</a></li>
+ <li><a href="http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id = "forumLink" title = "Drop by and say hello on our forum.">
+ <img src = "img/buttonForum.jpg" height = "20px" width = "120px" alt = "Forum" />
+ Forum</a></li>
+ <li><a href="doc/html/index.html" id = "docLink" title = "Delve into our documentation.">
+ <img src = "img/buttonDoc.jpg" height = "20px" width = "120px" alt = "Documentation" />
+ Documentation</a></li>
+ <li><a href="compat.html" id = "compatLink" title = "View the compatability chart.">
+ <img src = "img/buttonCompat.jpg" height = "20px" width = "120px" alt = "Compatability Chart" />
+ Compatability Chart</a></li>
+ <li><a href="screens.html" id = "scrLink" title = "Checkout some screenshots of our project.">
+ <img src = "img/buttonScr.jpg" height = "20px" width = "120px" alt = "Screenshots" />
+ Screenshots</a></li>
+ <li><a href="videos.html" id = "vidLink" title = "Drool over our spiffy videos.">
+ <img src = "img/buttonVid.jpg" height = "20px" width = "120px" alt = "Videos" />
+ Videos</a></li>
+ <li><a href="links.html" id = "linksLink" title = "See what else we think is cool.">
+ <img src = "img/buttonLinks.jpg" height = "20px" width = "120px" alt = "Links" />
+ Links</a></li>
+ <li><a href="http://sourceforge.net/apps/trac/clonekeenplus/" id = "tracLink" title = "Help us squash those nasty little bast--BUGS.">
+ <img src = "img/buttonTrac.jpg" height = "20px" width = "120px" alt = "Trac" />
+ Bug Tracker</a></li>
+ </ul>
+ </div>
+
+ <div id = "sidebar">
+ <img src = "img/paris.jpg" height="157px" width="150px" title = "Paris... Why bother saving it?" alt = "Paris... Why bother saving it?" />
+ <h6>Commander Keen on modern systems!</h6>
+ <p>Enjoy the old but good games with better graphics, sound and controls.</p>
+ <h6>Commander Keen 4-6!</h6>
+ <p>We are working hard to make Commander Genius compatible with the Galaxy games.</p>
+ <a href="http://sourceforge.net/project/project_donations.php?group_id=249154">
+ <img alt="Please support our project" height = "32px" width = "88px" src = "http://images.sourceforge.net/images/project-support.jpg" />
+ </a>
+ </div>
+
+ <div id = "mainContent">
+ <div id = "intro">
+ <h1>Downloads</h1>
+ <p>
+ We have the interpreter for different operating systems and
+ devices. Select your system and you are off to play!
+ </p>
+ </div>
+
+ <div id = "platforms">
+ <img class = "floatLeft" width = "420px" height = "323px" alt="CKP02ans" src = "img/presenv03cg.png" />
+ <h1>Commander Genius Platforms</h1>
+
+ <p>
+ <img width = "32px" height = "30px" alt="Win7" src = "img/win7.png" />
+ Windows (98, ME, 2000, XP, Vista, 7 and others) - Version 0.3.7 -
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-WIN32.exe/download">Installer (32 bit)</a>
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-WIN32.zip/download">ZIP Package (32 bit)</a>
+
+ </p>
+
+ <p>
+ <img width = "44px" height = "48px" alt="Linux" src = "img/linux.jpg" />
+ Linux (Binary only) - Version 0.3.7 -
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-i386.tar.gz/download">32-bit</a>
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-amd64.tar.gz/download">64-bit</a>
+ </p>
+
+ <p>
+ <img width = "48px" height = "44px" alt="Linux" src = "img/ubuntu.jpg" />
+ Ubuntu Linux (11.04 and higher recommended) and Debian based distros - Version 0.3.7 -
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-i386.deb/download">32-bit</a>
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-amd64.deb/download">64-bit</a>
+ </p>
+
+ <p>
+ <img width = "48px" height = "44px" alt="Linux" src = "img/fedorasuse.png" />
+ Fedora (15+) or OpenSuse (11.4+) and RPM based distros - Version 0.3.7 -
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-i386.rpm/download">32-bit</a>
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-amd64.rpm/download">64-bit</a>
+ </p>
+
+ <p>
+ <img width = "43px" height = "40px" alt="MacOsX" src = "img/macosx.jpg" />
+ MacOS X (10.3 and later) - v0.3.5 -
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.5/CGenius-0.3.5-Mac.dmg/download">Universal</a>
+ </p>
+
+ <p>
+ <img width = "43px" height = "48px" alt="GP2X" src = "img/iphonewallet.jpg" />
+ iPhone - Commander Genius v0.3.2.x - (Still under construction)
+ </p>
+
+ <p>
+ <img width = "39px" height = "64px" alt="Android" src = "img/google-android.jpg" />
+ Google Android Devices
+ <a href="http://www.androidpit.com/en/android/market/apps/app/net.sourceforge.clonekeenplus/Commander-Genius">Commander Genius 0.3.2.x</a>
+ </p>
+
+ <p>
+ <img width = "60px" height = "48px" alt="GP2X" src = "img/gp2x.jpg" />
+ Open Handhelds
+ <a href="http://dl.openhandhelds.org/cgi-bin/gp2x.cgi?0,0,0,0,20,2832">Commander Genius (GP2X) [0.3.2.6]</a>
+ <a href="http://dl.openhandhelds.org/cgi-bin/wiz.cgi?0,0,0,0,35,55">Commander Genius (Wiz) [0.3.2.6]</a>
+ <a href="http://dl.openhandhelds.org/cgi-bin/pandora.cgi?0,0,0,0,35,50">Commander Genius (Pandora) [0.3.2.6]</a>
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.2.x/cgenius-dingoo-r2.tar.bz2/download">Commander Genius (Dingoo) [0.3.2.6]</a>
+ </p>
+
+ <h1>Get the latest source code via GIT</h1>
+
+ <p>
+ All current versions are now stable, this doesn't mean perfect, just
+ good enough. The stable version is
+ known to work on most of the systems and has been tested deeper. The
+ Prereleases are known to be stable too, but with minor issues.
+ </p>
+
+ <p>
+ You can also browse through the Sourceforge.net packages <a href="https://sourceforge.net/project/showfiles.php?group_id=249154">here</a>.
+ They may not be the most stable versions, but they are more recent. If
+ you find bugs in them we would be happy if you report
+ them to us so we can improve Commander Genius.
+ </p>
+
+ <p>
+ If you want the most recent source code you can also download it per GIT <a href="http://sourceforge.net/scm/?type=git&group_id=249154">here</a>
+ </p>
+
+ <h1>Bugs found?</h1>
+ <p>
+ We are happy to see people who test our product. If you want to report bugs, you can
+ do that <a href="http://sourceforge.net/apps/trac/clonekeenplus/">here</a>. This is mainly used by our developers but
+ can be used by everybody.
+ </p>
+
+ <a href="http://sourceforge.net/apps/trac/clonekeenplus/">Trac</a>
+ </div>
+
+ <div id = "highQualityPack">
+ <img class = "floatLeft" width = "425px" height = "296px" alt="HQP" src = "img/HQP1.png" />
+ <h1>High Quality Pack (HQP)</h1>
+
+ <p>
+ The High Quality Pack provides extra resources for Commander
+ Genius like music and extra sound effects and svga graphics. When
+ installed, you can hear music in the first episode of the game. High
+ quality SVGA tilesets have been added to Episode 1 & 2.
+ More is about to come!
+ </p>
+ <p>Try it out! It really makes an old game look great!</p>
+
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/High%20Quality%20Packs/Version%201.x/hqpv18.zip/download">Download</a>
+
+ <h1>Tools around Commander Genius</h1>
+ <p>
+ Here are some tools and other Code we have been
+ building up to support more games and introduce new
+ features.
+ </p>
+
+ <p>
+ Take a look at the directory
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Tools/">here</a>
+ </p>
+ </div>
+
+ <div id = "K1">
+ <img class = "floatLeft" width = "422px" height = "262px" alt="Commander Keen 1" src = "img/keen1title.gif" />
+ <h1>Commander Keen Episode 1: "Marooned on Mars"</h1>
+ <p>
+ If you don't own any Commander Keen game, you will need
+ one to get the interpreter run. If you own one or the
+ trilogy, you can use them. This is the original
+ DOS-Version of Commander Keen Episode 1 (Shareware).
+ The bundle versions have included this episode already,
+ so no download needed for those.
+ </p>
+ <a href="http://www.tl-dr.org/downloads/keen/official/keen1-1.31.zip">Download</a>
+ </div>
+ </div>
+
+ <div id = "footer" class = "containCentered">
+ <h6>hosted by</h6>
+ <a href="http://sourceforge.net" class = "centered">
+ <img src = "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt="SourceForge.net Logo" height="37px" width="125px" />
+ </a>
+ <p class = "centered">2011 Commander Genius is licensed under GPL</p>
+ <a href="mailto:%20g...@gm..." class="baseline centered">by The Commander Genius Team</a>
+ </div>
+
+ <script type="text/javascript" src = "tracking.js"></script>
+ </body>
</html>
diff --git a/website/index.html b/website/index.html
index a1357ce..3d2d7e0 100644
--- a/website/index.html
+++ b/website/index.html
@@ -232,10 +232,10 @@
<a href="http://sourceforge.net" class = "centered">
<img src = "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt="SourceForge.net Logo" height="37px" width="125px" />
</a>
- <p class = "centered">2011 Commander Genius is licensed under GPL</p>
- <a href="mailto:%20g...@gm..." class="baseline">by The Commander Genius Team</a>
+ <p class= "centered">2011 Commander Genius is licensed under GPL</p>
+ <a href= "mailto:%20g...@gm..." class="baseline">by The Commander Genius Team</a>
</div>
- <script type="text/javascript" src = "tracking.js"></script>
+ <script type= "text/javascript" src= "tracking.js"></script>
</body>
</html>
diff --git a/website/links.html b/website/links.html
index f9ca9fa..5132dfb 100644
--- a/website/links.html
+++ b/website/links.html
@@ -1,126 +1,124 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <!-- Made by Gerstrong & FCTW -->
- <title>Commander Genius Web-Site</title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <meta name="keywords" content="Keywords here" />
- <meta name="description" content="Description here" />
- <meta name="author" content="Gerhard Stein" />
- <!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
- <meta name="robots" content="index, follow" />
- <meta name="revisit-after" content="30 days" />
- <meta name="distribution" content="global" />
- <meta name="rating" content="general" />
- <meta name="Content-Language" content="english" />
- <link href="reset.css" rel="stylesheet" type="text/css" />
- <link href="main.css" rel="stylesheet" type="text/css" />
- <link rel="shortcut icon" href="img/favicon.ico" />
- </head>
+ <head>
+ <!-- Made by Gerstrong & FCTW -->
+ <title>Commander Genius Web-Site</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ <meta name="keywords" content="Keywords here" />
+ <meta name="description" content="Description here" />
+ <meta name="author" content="Gerhard Stein" />
+ <!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
+ <meta name="robots" content="index, follow" />
+ <meta name="revisit-after" content="30 days" />
+ <meta name="distribution" content="global" />
+ <meta name="rating" content="general" />
+ <meta name="Content-Language" content="english" />
+ <link href="reset.css" rel="stylesheet" type="text/css" />
+ <link href="main.css" rel="stylesheet" type="text/css" />
+ <link rel="shortcut icon" href="img/favicon.ico" />
+ </head>
- <body>
- <div id = "header">
- <img src = "img/toplogo.jpg" height="87px" width="342px" id = "headerImg" alt = "The Bean-With-Bacon" />
- <ul>
- <li><a href="index.html" id = "indexLink" title = "Find out about us. (You know you want to.)">
- <img src = "img/buttonAbout.jpg" height = "20px" width = "120px" alt = "About Us" />
- About Us</a></li>
- <li><a href="news.html" id = "newsLink" title = "Have you heard what's new?">
- <img src = "img/buttonNews.jpg" height = "20px" width = "120px" alt = "News" />
- News</a></li>
- <li><a href="download.html" id = "downLink" title = "Get this fantastic interpreter.">
- <img src = "img/buttonDown.jpg" height = "20px" width = "120px" alt = "Download" />
- Download</a></li>
- <li><a href="http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id = "forumLink" title = "Drop by and say hello on our forum.">
- <img src = "img/buttonForum.jpg" height = "20px" width = "120px" alt = "Forum" />
- Forum</a></li>
- <li><a href="doc/html/index.html" id = "docLink" title = "Delve into our documentation.">
- <img src = "img/buttonDoc.jpg" height = "20px" width = "120px" alt = "Documentation" />
- Documentation</a></li>
- </ul>
- <ul id = "secondLine">
- <li><a href="compat.html" id = "compatLink" title = "View the compatability chart.">
- <img src = "img/buttonCompat.jpg" height = "20px" width = "120px" alt = "Compatability Chart" />
- Compatability Chart</a></li>
- <li><a href="screens.html" id = "scrLink" title = "Checkout some screenshots of our project.">
- <img src = "img/buttonScr.jpg" height = "20px" width = "120px" alt = "Screenshots" />
- Screenshots</a></li>
- <li><a href="videos.html" id = "vidLink" title = "Drool over our spiffy videos.">
- <img src = "img/buttonVid.jpg" height = "20px" width = "120px" alt = "Videos" />
- Videos</a></li>
- <li><a href="links.html" id = "linksLink" title = "See what else we think is cool.">
- <img src = "img/buttonLinks.jpg" height = "20px" width = "120px" alt = "Links" />
- Links</a></li>
- <li><a href="http://sourceforge.net/apps/trac/clonekeenplus/" id = "tracLink" title = "Help us squash those nasty little bast--BUGS.">
- <img src = "img/buttonTrac.jpg" height = "20px" width = "120px" alt = "Trac" />
- Bug Tracker</a></li>
- </ul>
- </div>
+ <body>
+ <div id = "header">
+ <img src = "img/toplogo.jpg" height="87px" width="342px" id = "headerImg" alt = "The Bean-With-Bacon" />
+ <ul>
+ <li><a href="index.html" id = "indexLink" title = "Find out about us. (You know you want to.)">
+ <img src = "img/buttonAbout.jpg" height = "20px" width = "120px" alt = "About Us" />
+ About Us</a></li>
+ <li><a href="news.html" id = "newsLink" title = "Have you heard what's new?">
+ <img src = "img/buttonNews.jpg" height = "20px" width = "120px" alt = "News" />
+ News</a></li>
+ <li><a href="download.html" id = "downLink" title = "Get this fantastic interpreter.">
+ <img src = "img/buttonDown.jpg" height = "20px" width = "120px" alt = "Download" />
+ Download</a></li>
+ <li><a href="http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id = "forumLink" title = "Drop by and say hello on our forum.">
+ <img src = "img/buttonForum.jpg" height = "20px" width = "120px" alt = "Forum" />
+ Forum</a></li>
+ <li><a href="doc/html/index.html" id = "docLink" title = "Delve into our documentation.">
+ <img src = "img/buttonDoc.jpg" height = "20px" width = "120px" alt = "Documentation" />
+ Documentation</a></li>
+ <li><a href="compat.html" id = "compatLink" title = "View the compatability chart.">
+ <img src = "img/buttonCompat.jpg" height = "20px" width = "120px" alt = "Compatability Chart" />
+ Compatability Chart</a></li>
+ <li><a href="screens.html" id = "scrLink" title = "Checkout some screenshots of our project.">
+ <img src = "img/buttonScr.jpg" height = "20px" width = "120px" alt = "Screenshots" />
+ Screenshots</a></li>
+ <li><a href="videos.html" id = "vidLink" title = "Drool over our spiffy videos.">
+ <img src = "img/buttonVid.jpg" height = "20px" width = "120px" alt = "Videos" />
+ Videos</a></li>
+ <li><a href="links.html" id = "linksLink" title = "See what else we think is cool.">
+ <img src = "img/buttonLinks.jpg" height = "20px" width = "120px" alt = "Links" />
+ Links</a></li>
+ <li><a href="http://sourceforge.net/apps/trac/clonekeenplus/" id = "tracLink" title = "Help us squash those nasty little bast--BUGS.">
+ <img src = "img/buttonTrac.jpg" height = "20px" width = "120px" alt = "Trac" />
+ Bug Tracker</a></li>
+ </ul>
+ </div>
- <div id = "sidebar">
- <img src = "img/nessiegreet.jpg" height="157px" width="150px" alt = "Keen and Messie" />
- <h6>Commander Keen on modern systems!</h6>
- <p>Enjoy the old but good games with better graphics, sound and controls.</p>
- <h6>Commander Keen 4-6!</h6>
- <p>We are working hard to make Commander Genius compatible with the Galaxy games.</p>
- <a href="http://sourceforge.net/project/project_donations.php?group_id=249154">
- <img alt="Please support our project" height = "32px" width = "88px" src = "http://images.sourceforge.net/images/project-support.jpg" />
- </a>
- </div>
+ <div id = "sidebar">
+ <img src = "img/nessiegreet.jpg" height="157px" width="150px" alt = "Keen and Messie" />
+ <h6>Commander Keen on modern systems!</h6>
+ <p>Enjoy the old but good games with better graphics, sound and controls.</p>
+ <h6>Commander Keen 4-6!</h6>
+ <p>We are working hard to make Commander Genius compatible with the Galaxy games.</p>
+ <a href="http://sourceforge.net/project/project_donations.php?group_id=249154">
+ <img alt="Please support our project" height = "32px" width = "88px" src = "http://images.sourceforge.net/images/project-support.jpg" />
+ </a>
+ </div>
- <div id = "mainContent">
- <div></div>
- <h1>Links</h1>
+ <div id = "mainContent">
+ <div></div>
+ <h1>Links</h1>
- <div></div>
- <a href="http://clonekeenplus.neejean.org/">Commander Genius Official Forum</a>
- <p>
- This Forum is for users, testers, designers, composers and
- developers of Commander Genius. We are always happy to greet
- your there. It also has a nice chat box! Come in and join
- us!
- </p>
+ <div></div>
+ <a href="http://clonekeenplus.neejean.org/">Commander Genius Official Forum</a>
+ <p>
+ This Forum is for users, testers, designers, composers and
+ developers of Commander Genius. We are always happy to greet
+ your there. It also has a nice chat box! Come in and join
+ us!
+ </p>
- <div></div>
- <a href="http://www.pckf.com/">Public Commander Keen Forum</a>
- <p>
- Our favorite forum. You can find us all here and discuss
- about several topics around the Keen games. This Site helped
- us a lot and made the interpreter a better program.
- </p>
+ <div></div>
+ <a href="http://www.pckf.com/">Public Commander Keen Forum</a>
+ <p>
+ Our favorite forum. You can find us all here and discuss
+ about several topics around the Keen games. This Site helped
+ us a lot and made the interpreter a better program.
+ </p>
- <div></div>
- <a href="http://www.shikadi.net/keenwiki/Main_Page">Commander Keen Wiki</a>
- <p>Nice site with information about the Commander Keen Games.</p>
+ <div></div>
+ <a href="http://www.shikadi.net/keenwiki/Main_Page">Commander Keen Wiki</a>
+ <p>Nice site with information about the Commander Keen Games.</p>
- <div></div>
- <a href="http://www.shikadi.net/moddingwiki/Main_Page">Game Modding Wiki</a>
- <p>
- All the file format structures of some old DOS Games like
- Commander Keen.
- </p>
+ <div></div>
+ <a href="http://www.shikadi.net/moddingwiki/Main_Page">Game Modding Wiki</a>
+ <p>
+ All the file format structures of some old DOS Games like
+ Commander Keen.
+ </p>
- <div></div>
- <a href="http://dl.openhandhelds.org/cgi-bin/wiz.cgi">OpenHandhelds Wiz Archive</a>
- <p>Power for your wiz device!</p>
+ <div></div>
+ <a href="http://dl.openhandhelds.org/cgi-bin/wiz.cgi">OpenHandhelds Wiz Archive</a>
+ <p>Power for your wiz device!</p>
- <div></div>
- <a href="http://davince.tengudev.com/">DaVince's Website</a>
- <p>
- Nice website of a great fan of Commander Keen and good
- artist. It has some games, a blog and much more.
- </p>
- </div>
+ <div></div>
+ <a href="http://davince.tengudev.com/">DaVince's Website</a>
+ <p>
+ Nice website of a great fan of Commander Keen and good
+ artist. It has some games, a blog and much more.
+ </p>
+ </div>
- <div id = "footer" class = "containCentered">
- <h6>hosted by</h6>
- <a href="http://sourceforge.net" class = "centered">
- <img src = "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt="SourceForge.net Logo" height="37px" width="125px" />
- </a>
- <p class = "centered">2011 Commander Genius is licensed under GPL</p>
- <a href="mailto:%20g...@gm..." class="baseline" class = "centered">by The Commander Genius Team</a>
- </div>
+ <div id = "footer" class = "containCentered">
+ <h6>hosted by</h6>
+ <a href="http://sourceforge.net" class = "centered">
+ <img src = "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt="SourceForge.net Logo" height="37px" width="125px" />
+ </a>
+ <p class = "centered">2011 Commander Genius is licensed under GPL</p>
+ <a href="mailto:%20g...@gm..." class="baseline centered">by The Commander Genius Team</a>
+ </div>
- <script type="text/javascript" src = "tracking.js"></script>
- </body>
+ <script type="text/javascript" src = "tracking.js"></script>
+ </body>
</html>
diff --git a/website/news.html b/website/news.html
index e807b8e..4c06bd1 100644
--- a/website/news.html
+++ b/website/news.html
@@ -1,233 +1,231 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <!-- Made by Gerstrong & FCTW -->
- <title>Commander Genius Web-Site</title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <meta name="keywords" content="Keywords here" />
- <meta name="description" content="Description here" />
- <meta name="author" content="Gerhard Stein" />
- <!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
- <meta name="robots" content="index, follow" />
- <meta name="revisit-after" content="30 days" />
- <meta name="distribution" content="global" />
- <meta name="rating" content="general" />
- <meta name="Content-Language" content="english" />
- <link href="reset.css" rel="stylesheet" type="text/css" />
- <link href="main.css" rel="stylesheet" type="text/css" />
- <link rel="shortcut icon" href="img/favicon.ico" />
- </head>
+ <head>
+ <!-- Made by Gerstrong & FCTW -->
+ <title>Commander Genius Web-Site</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ <meta name="keywords" content="Keywords here" />
+ <meta name="description" content="Description here" />
+ <meta name="author" content="Gerhard Stein" />
+ <!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
+ <meta name="robots" content="index, follow" />
+ <meta name="revisit-after" content="30 days" />
+ <meta name="distribution" content="global" />
+ <meta name="rating" content="general" />
+ <meta name="Content-Language" content="english" />
+ <link href="reset.css" rel="stylesheet" type="text/css" />
+ <link href="main.css" rel="stylesheet" type="text/css" />
+ <link rel="shortcut icon" href="img/favicon.ico" />
+ </head>
- <body>
- <div id = "header">
- <img src = "img/toplogo.jpg" height="87px" width="342px" id = "headerImg" alt = "The Bean-With-Bacon" />
- <ul>
- <li><a href="index.html" id = "indexLink" title = "Find out about us. (You know you want to.)">
- <img src = "img/buttonAbout.jpg" height = "20px" width = "120px" alt = "About Us" />
- About Us</a></li>
- <li><a href="news.html" id = "newsLink" title = "Have you heard what's new?">
- <img src = "img/buttonNews.jpg" height = "20px" width = "120px" alt = "News" />
- News</a></li>
- <li><a href="download.html" id = "downLink" title = "Get this fantastic interpreter.">
- <img src = "img/buttonDown.jpg" height = "20px" width = "120px" alt = "Download" />
- Download</a></li>
- <li><a href="http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id = "forumLink" title = "Drop by and say hello on our forum.">
- <img src = "img/buttonForum.jpg" height = "20px" width = "120px" alt = "Forum" />
- Forum</a></li>
- <li><a href="doc/html/index.html" id = "docLink" title = "Delve into our documentation.">
- <img src = "img/buttonDoc.jpg" height = "20px" width = "120px" alt = "Documentation" />
- Documentation</a></li>
- </ul>
- <ul id = "secondLine">
- <li><a href="compat.html" id = "compatLink" title = "View the compatability chart.">
- <img src = "img/buttonCompat.jpg" height = "20px" width = "120px" alt = "Compatability Chart" />
- Compatability Chart</a></li>
- <li><a href="screens.html" id = "scrLink" title = "Checkout some screenshots of our project.">
- <img src = "img/buttonScr.jpg" height = "20px" width = "120px" alt = "Screenshots" />
- Screenshots</a></li>
- <li><a href="videos.html" id = "vidLink" title = "Drool over our spiffy videos.">
- <img src = "img/buttonVid.jpg" height = "20px" width = "120px" alt = "Videos" />
- Videos</a></li>
- <li><a href="links.html" id = "linksLink" title = "See what else we think is cool.">
- <img src = "img/buttonLinks.jpg" height = "20px" width = "120px" alt = "Links" />
- Links</a></li>
- <li><a href="http://sourceforge.net/apps/trac/clonekeenplus/" id = "tracLink" title = "Help us squash those nasty little bast--BUGS.">
- <img src = "img/buttonTrac.jpg" height = "20px" width = "120px" alt = "Trac" />
- Bug Tracker</a></li>
- </ul>
- </div>
+ <body>
+ <div id = "header">
+ <img src = "img/toplogo.jpg" height="87px" width="342px" id = "headerImg" alt = "The Bean-With-Bacon" />
+ <ul>
+ <li><a href="index.html" id = "indexLink" title = "Find out about us. (You know you want to.)">
+ <img src = "img/buttonAbout.jpg" height = "20px" width = "120px" alt = "About Us" />
+ About Us</a></li>
+ <li><a href="news.html" id = "newsLink" title = "Have you heard what's new?">
+ <img src = "img/buttonNews.jpg" height = "20px" width = "120px" alt = "News" />
+ News</a></li>
+ <li><a href="download.html" id = "downLink" title = "Get this fantastic interpreter.">
+ <img src = "img/buttonDown.jpg" height = "20px" width = "120px" alt = "Download" />
+ Download</a></li>
+ <li><a href="http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id = "forumLink" title = "Drop by and say hello on our forum.">
+ <img src = "img/buttonForum.jpg" height = "20px" width = "120px" alt = "Forum" />
+ Forum</a></li>
+ <li><a href="doc/html/index.html" id = "docLink" title = "Delve into our documentation.">
+ <img src = "img/buttonDoc.jpg" height = "20px" width = "120px" alt = "Documentation" />
+ Documentation</a></li>
+ <li><a href="compat.html" id = "compatLink" title = "View the compatability chart.">
+ <img src = "img/buttonCompat.jpg" height = "20px" width = "120px" alt = "Compatability Chart" />
+ Compatability Chart</a></li>
+ <li><a href="screens.html" id = "scrLink" title = "Checkout some screenshots of our project.">
+ <img src = "img/buttonScr.jpg" height = "20px" width = "120px" alt = "Screenshots" />
+ Screenshots</a></li>
+ <li><a href="videos.html" id = "vidLink" title = "Drool over our spiffy videos.">
+ <img src = "img/buttonVid.jpg" height = "20px" width = "120px" alt = "Videos" />
+ Videos</a></li>
+ <li><a href="links.html" id = "linksLink" titl...
[truncated message content] |
|
From: Casey B. <fc...@us...> - 2011-12-20 21:34:44
|
via 2a1fd4ff6a32e3bee27c2fb911035cae1ba5fdbb (commit)
from a73fa2a94b888612b7c8d1ad18abcc5cd7f5b60e (commit)
- Log -----------------------------------------------------------------
commit 2a1fd4ff6a32e3bee27c2fb911035cae1ba5fdbb
Author: Casey Bird <FromCrimsonToWool+SourceTree@Gmail.com>
Date: Tue Dec 20 16:33:53 2011 -0500
-Fixed header nav bar
-Cleanups
-More to come later
-----------------------------------------------------------------------
Summary of changes:
website/index.html | 454 ++++++++++++++++++++++++++--------------------------
website/main.css | 313 ++++++++++++++++++------------------
2 files changed, 386 insertions(+), 381 deletions(-)
diff --git a/website/index.html b/website/index.html
index c798493..a1357ce 100644
--- a/website/index.html
+++ b/website/index.html
@@ -1,243 +1,241 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <!-- Made by Gerstrong & FCTW -->
- <title>Commander Genius Web-Site</title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <meta name="keywords" content="Keywords here" />
- <meta name="description" content="Description here" />
- <meta name="author" content="Gerhard Stein" />
- <!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
- <meta name="robots" content="index, follow" />
- <meta name="revisit-after" content="30 days" />
- <meta name="distribution" content="global" />
- <meta name="rating" content="general" />
- <meta name="Content-Language" content="english" />
- <link href="reset.css" rel="stylesheet" type="text/css" />
- <link href="main.css" rel="stylesheet" type="text/css" />
- <link rel="shortcut icon" href="img/favicon.ico" />
- </head>
+ <head>
+ <!-- Made by Gerstrong & FCTW -->
+ <title>Commander Genius Web-Site</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ <meta name="keywords" content="Keywords here" />
+ <meta name="description" content="Description here" />
+ <meta name="author" content="Gerhard Stein" />
+ <!-- (Robot commands: All, None, Index, No Index, Follow, No Follow) -->
+ <meta name="robots" content="index, follow" />
+ <meta name="revisit-after" content="30 days" />
+ <meta name="distribution" content="global" />
+ <meta name="rating" content="general" />
+ <meta name="Content-Language" content="english" />
+ <link href="reset.css" rel="stylesheet" type="text/css" />
+ <link href="main.css" rel="stylesheet" type="text/css" />
+ <link rel="shortcut icon" href="img/favicon.ico" />
+ </head>
- <body>
- <div id = "header">
- <img src = "img/toplogo.jpg" height="87px" width="342px" id = "headerImg" alt = "The Bean-With-Bacon" />
- <ul>
- <li><a href="index.html" id = "indexLink" title = "Find out about us. (You know you want to.)">
- <img src = "img/buttonAbout.jpg" height = "20px" width = "120px" alt = "About Us" />
- About Us</a></li>
- <li><a href="news.html" id = "newsLink" title = "Have you heard what's new?">
- <img src = "img/buttonNews.jpg" height = "20px" width = "120px" alt = "News" />
- News</a></li>
- <li><a href="download.html" id = "downLink" title = "Get this fantastic interpreter.">
- <img src = "img/buttonDown.jpg" height = "20px" width = "120px" alt = "Download" />
- Download</a></li>
- <li><a href="http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id = "forumLink" title = "Drop by and say hello on our forum.">
- <img src = "img/buttonForum.jpg" height = "20px" width = "120px" alt = "Forum" />
- Forum</a></li>
- <li><a href="doc/html/index.html" id = "docLink" title = "Delve into our documentation.">
- <img src = "img/buttonDoc.jpg" height = "20px" width = "120px" alt = "Documentation" />
- Documentation</a></li>
- </ul>
- <ul id = "secondLine">
- <li><a href="compat.html" id = "compatLink" title = "View the compatability chart.">
- <img src = "img/buttonCompat.jpg" height = "20px" width = "120px" alt = "Compatability Chart" />
- Compatability Chart</a></li>
- <li><a href="screens.html" id = "scrLink" title = "Checkout some screenshots of our project.">
- <img src = "img/buttonScr.jpg" height = "20px" width = "120px" alt = "Screenshots" />
- Screenshots</a></li>
- <li><a href="videos.html" id = "vidLink" title = "Drool over our spiffy videos.">
- <img src = "img/buttonVid.jpg" height = "20px" width = "120px" alt = "Videos" />
- Videos</a></li>
- <li><a href="links.html" id = "linksLink" title = "See what else we think is cool.">
- <img src = "img/buttonLinks.jpg" height = "20px" width = "120px" alt = "Links" />
- Links</a></li>
- <li><a href="http://sourceforge.net/apps/trac/clonekeenplus/" id = "tracLink" title = "Help us squash those nasty little bast--BUGS.">
- <img src = "img/buttonTrac.jpg" height = "20px" width = "120px" alt = "Trac" />
- Bug Tracker</a></li>
- </ul>
- </div>
+ <body>
+ <div id = "header">
+ <img src = "img/toplogo.jpg" height="87px" width="342px" id = "headerImg" alt = "The Bean-With-Bacon" />
+ <ul>
+ <li><a href="index.html" id = "indexLink" title = "Find out about us. (You know you want to.)">
+ <img src = "img/buttonAbout.jpg" height = "20px" width = "120px" alt = "About Us" />
+ About Us</a></li>
+ <li><a href="news.html" id = "newsLink" title = "Have you heard what's new?">
+ <img src = "img/buttonNews.jpg" height = "20px" width = "120px" alt = "News" />
+ News</a></li>
+ <li><a href="download.html" id = "downLink" title = "Get this fantastic interpreter.">
+ <img src = "img/buttonDown.jpg" height = "20px" width = "120px" alt = "Download" />
+ Download</a></li>
+ <li><a href="http://www.pckf.com/viewforum.php?f=9&sid=c0fa5134d3f3663fbc8b866caa70a3bf" id = "forumLink" title = "Drop by and say hello on our forum.">
+ <img src = "img/buttonForum.jpg" height = "20px" width = "120px" alt = "Forum" />
+ Forum</a></li>
+ <li><a href="doc/html/index.html" id = "docLink" title = "Delve into our documentation.">
+ <img src = "img/buttonDoc.jpg" height = "20px" width = "120px" alt = "Documentation" />
+ Documentation</a></li>
+ <li><a href="compat.html" id = "compatLink" title = "View the compatability chart.">
+ <img src = "img/buttonCompat.jpg" height = "20px" width = "120px" alt = "Compatability Chart" />
+ Compatability Chart</a></li>
+ <li><a href="screens.html" id = "scrLink" title = "Checkout some screenshots of our project.">
+ <img src = "img/buttonScr.jpg" height = "20px" width = "120px" alt = "Screenshots" />
+ Screenshots</a></li>
+ <li><a href="videos.html" id = "vidLink" title = "Drool over our spiffy videos.">
+ <img src = "img/buttonVid.jpg" height = "20px" width = "120px" alt = "Videos" />
+ Videos</a></li>
+ <li><a href="links.html" id = "linksLink" title = "See what else we think is cool.">
+ <img src = "img/buttonLinks.jpg" height = "20px" width = "120px" alt = "Links" />
+ Links</a></li>
+ <li><a href="http://sourceforge.net/apps/trac/clonekeenplus/" id = "tracLink" title = "Help us squash those nasty little bast--BUGS.">
+ <img src = "img/buttonTrac.jpg" height = "20px" width = "120px" alt = "Trac" />
+ Bug Tracker</a></li>
+ </ul>
+ </div>
- <div id = "sidebar">
- <img src = "img/mainpic1.jpg" height="157px" width="150px" alt = "Spot - The Yorp" />
- <h6>Commander Keen on modern systems!</h6>
- <p>Enjoy the old but good games with better graphics, sound and controls.</p>
- <h6>Commander Keen 4-6!</h6>
- <p>We are working hard to make Commander Genius compatible with the Galaxy games.</p>
- <a href="http://sourceforge.net/project/project_donations.php?group_id=249154">
- <img alt="Please support our project" height = "32px" width = "88px" src = "http://images.sourceforge.net/images/project-support.jpg" />
- </a>
- </div>
+ <div id = "sidebar">
+ <img src = "img/mainpic1.jpg" height="157px" width="150px" alt = "Spot - The Yorp" />
+ <h6>Commander Keen on modern systems!</h6>
+ <p>Enjoy the old but good games with better graphics, sound and controls.</p>
+ <h6>Commander Keen 4-6!</h6>
+ <p>We are working hard to make Commander Genius compatible with the Galaxy games.</p>
+ <a href="http://sourceforge.net/project/project_donations.php?group_id=249154">
+ <img alt="Please support our project" height = "32px" width = "88px" src = "http://images.sourceforge.net/images/project-support.jpg" />
+ </a>
+ </div>
- <div id = "mainContent">
- <div id = "intro">
- <h1>Start/About</h1>
- <h2>Welcome to Commander Genius</h2>
- <p>
- Commander Genius, also known as CloneKeen Plus, is an
- engine which interprets the Commander Keen Invasion of
- the Vorticons series. As fans and developers, we try to
- implement new features, improve the gameplay, and give
- players an experience that feels like playing the
- original game. You will also need the original game
- files in addition to Commander Genius. Commander Keen:
- Marooned on Mars is shareware and may be freely, and
- legally downloaded elsewhere. Commander Keen: The Earth
- Explodes and Commander Keen: Keen Must Die! are
- registered versions which can be purchased from 3D
- Realms, Apogee, or purchased from someone willing to
- sell you their copy. If you still have these old games,
- then give Commander Genius a try! You will be surprised
- at how good they look and how much fun they are to play!
- </p>
- </div>
+ <div id = "mainContent">
+ <div id = "intro">
+ <h1>Start/About</h1>
+ <h2>Welcome to Commander Genius</h2>
+ <p>
+ Commander Genius, also known as CloneKeen Plus, is an
+ engine which interprets the Commander Keen Invasion of
+ the Vorticons series. As fans and developers, we try to
+ implement new features, improve the gameplay, and give
+ players an experience that feels like playing the
+ original game. You will also need the original game
+ files in addition to Commander Genius. Commander Keen:
+ Marooned on Mars is shareware and may be freely, and
+ legally downloaded elsewhere. Commander Keen: The Earth
+ Explodes and Commander Keen: Keen Must Die! are
+ registered versions which can be purchased from 3D
+ Realms, Apogee, or purchased from someone willing to
+ sell you their copy. If you still have these old games,
+ then give Commander Genius a try! You will be surprised
+ at how good they look and how much fun they are to play!
+ </p>
+ </div>
- <div id = "ourTeam">
- <div class = "fauxTable">
- <h2>The Commander Genius Team</h2>
- <p>These are the people who made all this magic possible.</p>
- <ul>
- <li>
- <em>Developer, website originator, and
- project manager:</em> Gerhard Wolfgang Stein
- (aka Gerstrong)
- </li>
- <li><em>Developer and port to GP2X:</em> Scott Smith (aka Pickle)</li>
- <li><em>Developer and tester:</em> Albert Zeyer</li>
- <li><em>Developer, tester and forum:</em> Pizza2004</li>
- <li><em>Developer, resource administrator and main tester:</em> Tulip</li>
- <li><em>Composer of high quality music and tester:</em> DaVince</li>
- <li><em>Developer and port to Dingux:</em> Zear</li>
- <li><em>Developer, website developer, and tester:</em> Casey (aka FCTW)</li>
- <li><em>Researching:</em> Lemm</li>
- <li><em>Ports to Google Android:</em> Pelya</li>
- <li><em>Developer and tester:</em> Commander Spleen</li>
- <li><em>Original developer of CloneKeen:</em> Caitlin Shaw</li>
- </ul>
- </div>
+ <div id = "ourTeam">
+ <div class = "fauxTable">
+ <h2>The Commander Genius Team</h2>
+ <p>These are the people who made all this magic possible.</p>
+ <ul>
+ <li>
+ <em>Developer, website originator, and
+ project manager:</em> Gerhard Wolfgang Stein
+ (aka Gerstrong)
+ </li>
+ <li><em>Developer and port to GP2X:</em> Scott Smith (aka Pickle)</li>
+ <li><em>Developer and tester:</em> Albert Zeyer</li>
+ <li><em>Developer, tester and forum:</em> Pizza2004</li>
+ <li><em>Developer, resource administrator and main tester:</em> Tulip</li>
+ <li><em>Composer of high quality music and tester:</em> DaVince</li>
+ <li><em>Developer and port to Dingux:</em> Zear</li>
+ <li><em>Developer, website developer, and tester:</em> Casey (aka FCTW)</li>
+ <li><em>Researching:</em> Lemm</li>
+ <li><em>Ports to Google Android:</em> Pelya</li>
+ <li><em>Developer and tester:</em> Commander Spleen</li>
+ <li><em>Original developer of CloneKeen:</em> Caitlin Shaw</li>
+ </ul>
+ </div>
- <div class = "fauxTable">
- <h2>Credits and special thanks to people who help us a lot:</h2>
- <ul>
- <li>James K. Beard</li>
- <li>Ceilick</li>
- <li>Sciz CT</li>
- <li>Iv4n</li>
- <li>ThunderPX</li>
- <li>Mink</li>
- <li>CKeen</li>
- <li>TheHackerCat</li>
- <li>NY00123</li>
- <li>Malvineos</li>
- <li>Lemm</li>
- <li>Chrisfischtopher</li>
- <li>Hans de Goede</li>
- <li>Levelass</li>
- <li>ZidaneA</li>
- <li>DSL (Cool Icon design)</li>
- <li>Napalm (Information about PC-Speaker sound)</li>
- <li>...and many more we might have forgotten to mention.</li>
- </ul>
- </div>
- </div>
+ <div class = "fauxTable">
+ <h2>Credits and special thanks to people who help us a lot:</h2>
+ <ul>
+ <li>James K. Beard</li>
+ <li>Ceilick</li>
+ <li>Sciz CT</li>
+ <li>Iv4n</li>
+ <li>ThunderPX</li>
+ <li>Mink</li>
+ <li>CKeen</li>
+ <li>TheHackerCat</li>
+ <li>NY00123</li>
+ <li>Malvineos</li>
+ <li>Lemm</li>
+ <li>Chrisfischtopher</li>
+ <li>Hans de Goede</li>
+ <li>Levelass</li>
+ <li>ZidaneA</li>
+ <li>DSL (Cool Icon design)</li>
+ <li>Napalm (Information about PC-Speaker sound)</li>
+ <li>...and many more we might have forgotten to mention.</li>
+ </ul>
+ </div>
+ </div>
- <div id = "note">
- <p>
- <strong>NOTE:</strong> We are currently looking for
- fans of Commander Keen, developers, or artists who
- are interested in helping us. If someone wants to make
- a better interpreter for the Invasion of the Vorticons
- Series (Also Galaxy series, Dreams, and mods) they are
- more than welcome to help us. Just drop our project
- leader an Email at:<a href="mailto:ger...@gm...">
- ger...@gm...</a>
- </p>
- <p>
- We also have an IRC Channel. <em>#CommanderGenius
- </em>at <em>irc.foonetic.net</em>
- </p>
- </div>
+ <div id = "note">
+ <p>
+ <strong>NOTE:</strong> We are currently looking for
+ fans of Commander Keen, developers, or artists who
+ are interested in helping us. If someone wants to make
+ a better interpreter for the Invasion of the Vorticons
+ Series (Also Galaxy series, Dreams, and mods) they are
+ more than welcome to help us. Just drop our project
+ leader an Email at:<a href="mailto:ger...@gm...">
+ ger...@gm...</a>
+ </p>
+ <p>
+ We also have an IRC Channel. <em>#CommanderGenius
+ </em>at <em>irc.foonetic.net</em>
+ </p>
+ </div>
- <div id = "supportInfo">
- <img class = "floatLeft" height = "339px" width = "535px" alt="Commander Genius Keen4 - Galaxy" src = "img/keen4coming.png" />
- <h3>Goodbye Galaxy and Keen Dreams support</h3>
- <p>
- We are working hard on the Commander Genius support
- for the Goodbye Galaxy series, Keen Dreams, and also
- mods like Keen 7-9.
- </p>
- <p>
- Every update brings new features and more support. We
- try to do a version update once per month, so you can
- be sure you always have the newest, coolest features.
- </p>
- <p>
- Not just Windows, Linux, and Mac but other platforms
- are supported as well, and more will be supported in
- the future!
- </p>
- <h3>Invasion of the Vorticons support</h3>
- <p>
- This series is mostly bug free, and the physics are
- very accurate. If you want to experience Commander
- Keen Invasion of the Vorticons with some improvements
- yet classic gameplay, Commander Genius is the program
- you want!
- </p>
- </div>
+ <div id = "supportInfo">
+ <img class = "floatLeft" height = "339px" width = "535px" alt="Commander Genius Keen4 - Galaxy" src = "img/keen4coming.png" />
+ <h3>Goodbye Galaxy and Keen Dreams support</h3>
+ <p>
+ We are working hard on the Commander Genius support
+ for the Goodbye Galaxy series, Keen Dreams, and also
+ mods like Keen 7-9.
+ </p>
+ <p>
+ Every update brings new features and more support. We
+ try to do a version update once per month, so you can
+ be sure you always have the newest, coolest features.
+ </p>
+ <p>
+ Not just Windows, Linux, and Mac but other platforms
+ are supported as well, and more will be supported in
+ the future!
+ </p>
+ <h3>Invasion of the Vorticons support</h3>
+ <p>
+ This series is mostly bug free, and the physics are
+ very accurate. If you want to experience Commander
+ Keen Invasion of the Vorticons with some improvements
+ yet classic gameplay, Commander Genius is the program
+ you want!
+ </p>
+ </div>
- <div id = "features">
- <img class = "floatLeft" height = "334px" width = "535px" alt="2 Player Keening" src = "img/keenvga1.jpg" />
- <h3>Features</h3>
- <ul>
- <li>4 Player Mode</li>
- <li>Fully customizable button layout</li>
- <li>Graphic Scalers</li>
- <li>OpenGL Support</li>
- <li>Improved CloneKeen engine. Only small bits of it are left</li>
- <li>3 difficulty modes in all the Commander Keen games</li>
- <li>Mod support</li>
- <li>
- Automatic extraction of data (sounds, story, etc.)
- from the exe-files
- </li>
- <li>
- In-game Music support (Yes, music in the Invasion
- of the Vorticons series! And don't just trust us,
- it's sweet!)
- </li>
- <li>New graphical effects</li>
- <li>Much faster performance, because there is no emulation</li>
- <li>HUD in Invasion of the Vorticons</li>
- <li>High Quality Pack graphics and sound support</li>
- <li>and much more...</li>
- </ul>
+ <div id = "features">
+ <img class = "floatLeft" height = "334px" width = "535px" alt="2 Player Keening" src = "img/keenvga1.jpg" />
+ <h3>Features</h3>
+ <ul>
+ <li>4 Player Mode</li>
+ <li>Fully customizable button layout</li>
+ <li>Graphic Scalers</li>
+ <li>OpenGL Support</li>
+ <li>Improved CloneKeen engine. Only small bits of it are left</li>
+ <li>3 difficulty modes in all the Commander Keen games</li>
+ <li>Mod support</li>
+ <li>
+ Automatic extraction of data (sounds, story, etc.)
+ from the exe-files
+ </li>
+ <li>
+ In-game Music support (Yes, music in the Invasion
+ of the Vorticons series! And don't just trust us,
+ it's sweet!)
+ </li>
+ <li>New graphical effects</li>
+ <li>Much faster performance, because there is no emulation</li>
+ <li>HUD in Invasion of the Vorticons</li>
+ <li>High Quality Pack graphics and sound support</li>
+ <li>and much more...</li>
+ </ul>
- <p>Check it out today, it's free!</p>
- <a href="download.html">>> Go to the download page here!!</a>
- </div>
+ <p>Check it out today, it's free!</p>
+ <a href="download.html">>> Go to the download page here!!</a>
+ </div>
- <div id = "improvement">
- <img class = "floatLeft" height = "333px" width = "535px" alt="Darkness" src = "img/keendark.jpg" />
- <p>
- The right hand image that you see is Commander Keen in
- a dark room when playing the game normally under DOS
- (or for example DOS-Box). To the left you see the room
- using Commander Genius. Quite the difference, huh?! The
- darkness depends on the difficulty, so watch your step.
- ;-)
- </p>
- </div>
- </div>
+ <div id = "improvement">
+ <img class = "floatLeft" height = "333px" width = "535px" alt="Darkness" src = "img/keendark.jpg" />
+ <p>
+ The right hand image that you see is Commander Keen in
+ a dark room when playing the game normally under DOS
+ (or for example DOS-Box). To the left you see the room
+ using Commander Genius. Quite the difference, huh?! The
+ darkness depends on the difficulty, so watch your step.
+ ;-)
+ </p>
+ </div>
+ </div>
- <div id = "footer" class = "containCentered">
- <h6>hosted by</h6>
- <a href="http://sourceforge.net" class = "centered">
- <img src = "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt="SourceForge.net Logo" height="37px" width="125px" />
- </a>
- <p class = "centered">2011 Commander Genius is licensed under GPL</p>
- <a href="mailto:%20g...@gm..." class="baseline">by The Commander Genius Team</a>
- </div>
+ <div id = "footer" class = "containCentered">
+ <h6>hosted by</h6>
+ <a href="http://sourceforge.net" class = "centered">
+ <img src = "http://sflogo.sourceforge.net/sflogo.php?group_id=249154&type=4" alt="SourceForge.net Logo" height="37px" width="125px" />
+ </a>
+ <p class = "centered">2011 Commander Genius is licensed under GPL</p>
+ <a href="mailto:%20g...@gm..." class="baseline">by The Commander Genius Team</a>
+ </div>
- <script type="text/javascript" src = "tracking.js"></script>
- </body>
+ <script type="text/javascript" src = "tracking.js"></script>
+ </body>
</html>
diff --git a/website/main.css b/website/main.css
index 8813f94..7973f65 100644
--- a/website/main.css
+++ b/website/main.css
@@ -1,61 +1,61 @@
/* --------------- Basic Elements --------------- */
body {
- color: white;
- background: black url("img/stars.jpg") 0 0 repeat fixed;
- font-size: 100%;
- line-height: 100%;
+ color: white;
+ background: black url("img/stars.jpg") 0 0 repeat fixed;
+ font-size: 100%;
+ line-height: 100%;
}
body * {
- display: block;
- position: relative;
- font-family: Verdana, Arial, Helvetica, sans-serif;
+ display: block;
+ position: relative;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
}
h1 {
- color: #2271A0;
- font-size: 0.87em;
- font-style: normal;
- font-weight: bold;
- font-variant: normal;
- margin: 0.56em;
+ color: #2271A0;
+ font-size: 0.87em;
+ font-style: normal;
+ font-weight: bold;
+ font-variant: normal;
+ margin: 0.56em;
}
h2 {
- font-size: 0.75em;
- color: #667;
- margin: 0.56em;
- font-weight: bold;
+ font-size: 0.75em;
+ color: #667;
+ margin: 0.56em;
+ font-weight: bold;
}
h3, h6 {
- color: #2271A0;
- font-weight: bold;
+ color: #2271A0;
+ font-weight: bold;
}
p, h3, a, td {
- font-size: 0.75em;
- margin: 0.75em;
+ font-size: 0.75em;
+ margin: 0.75em;
}
p a {
- font-size: 100%;
- margin: 0;
+ font-size: 100%;
+ margin: 0;
}
p img {
- vertical-align: middle;
- display: inline;
+ vertical-align: middle;
+ display: inline;
}
a {
- color: black;
- text-decoration: none;
- display: inline;
+ color: black;
+ text-decoration: none;
+ display: inline;
}
a:hover {
- text-decoration: underline;
+ text-decoration: underline;
}
a[href ^="mailto:"] {
@@ -69,258 +69,265 @@ a[href ^="http"] {
}
ul, ol {
- padding: 0;
- margin: 0;
- list-style-type: none;
+ padding: 0;
+ margin: 0;
+ list-style-type: none;
}
li {
- margin: 0 0 0 2.5em;
- font-size: 0.68em;
- background: transparent url("") no-repeat 0 0.31em;
- display: list-item;
+ margin: 0 0 0 2.5em;
+ font-size: 0.68em;
+ background: transparent url("") no-repeat 0 0.31em;
+ display: list-item;
}
ol li {
- list-style-type: decimal;
+ list-style-type: decimal;
}
ul li {
- list-style-type: disc;
+ list-style-type: disc;
}
em {
- font-style: italic;
- display: inline;
+ font-style: italic;
+ display: inline;
}
strong {
- font-weight: bold;
- display: inline;
+ font-weight: bold;
+ display: inline;
}
tr {
- display: table-row;
+ display: table-row;
}
td, th {
- border: 0.19em outset grey;
- padding: 0.2em;
- display: table-cell;
+ border: 0.19em outset grey;
+ padding: 0.2em;
+ display: table-cell;
}
/* ------------------Header--------------------------- */
#header {
- width: 100%;
- overflow: hidden;
+ width: 100%;
+ overflow: hidden;
}
#header #headerImg {
- padding: 0.45em;
- width: auto;
- height: 5.43em;
- float: left;
+ padding: 0.45em;
+ width: auto;
+ height: 5.43em;
+ float: left;
}
#header ul {
- float: left;
- margin: 1.87em 1.5em 0;
-}
-
-#header #secondLine{
- margin: 0 1.5em 1.87em;
+ float: left;
+ margin: 1.87em 1.5em 0;
+ width: 600px;
}
#header li {
- position: relative;
- float: left;
- text-indent: -187em;
- font: 0/0 Arial;
- overflow: hidden;
- color: rgba(255,255,255,0);
- vertical-align: bottom;
- }
-
#header li a {
- width: 120px;
- height: 20px;
- background: transparent none 0 0 no-repeat;
- display: block;
+ position: relative;
+ float: left;
+ text-indent: -187em;
+ font: 0/0 Arial;
+ overflow: hidden;
+ color: rgba(255,255,255,0);
+ vertical-align: bottom;
+ }
+
+#header li a {
+ width: 120px;
+ height: 20px;
+ background: transparent none 0 0 no-repeat;
+ display: block;
}
#header li a:hover,
#header li a:focus {
- background-position: 0 -20px;
+ background-position: 0 -20px;
}
#header li a:active {
-// background-position: 0 -40px;
+// background-position: 0 -40px;
}
#header li a img {
- display: none;
+ display: none;
}
#header #indexLink {
- background-image: url("img/buttonAbout.jpg");
+ background-image: url("img/buttonAbout.jpg");
}
-
#header #newsLink {
- background-image: url('img/buttonNews.jpg');
+
+#header #newsLink {
+ background-image: url('img/buttonNews.jpg');
}
-
#header #downLink {
- background-image: url('img/buttonDown.jpg');
+
+#header #downLink {
+ background-image: url('img/buttonDown.jpg');
}
-
#header #forumLink {
- background-image: url('img/buttonForum.jpg');
+
+#header #forumLink {
+ background-image: url('img/buttonForum.jpg');
}
-
#header #docLink {
- background-image: url('img/buttonDoc.jpg');
+
+#header #docLink {
+ background-image: url('img/buttonDoc.jpg');
}
-
#header #compatLink {
- background-image: url('img/buttonCompat.jpg');
+
+#header #compatLink {
+ background-image: url('img/buttonCompat.jpg');
}
-
#header #scrLink {
- background-image: url('img/buttonScr.jpg');
+
+#header #scrLink {
+ background-image: url('img/buttonScr.jpg');
}
-
#header #vidLink {
- background-image: url('img/buttonVid.jpg');
+
+#header #vidLink {
+ background-image: url('img/buttonVid.jpg');
}
-
#header #linksLink {
- background-image: url('img/buttonLinks.jpg');
+
+#header #linksLink {
+ background-image: url('img/buttonLinks.jpg');
}
-
#header #tracLink {
- background-image: url('img/buttonTrac.jpg');
+
+#header #tracLink {
+ background-image: url('img/buttonTrac.jpg');
}
/* ------------------Sidebar--------------------------- */
#sidebar {
- width: 9.37em;
- float: left;
- clear: both;
- background: black;
+ width: 9.37em;
+ float: left;
+ clear: both;
+ background: black;
}
#sidebar h6,
#sidebar p {
- color: #2271A0;
- font-weight: bold;
- width: 13em;
- line-height: normal;
- font-size: 0.62em;
- padding: 0;
- margin: 0 0 0 2em;
+ color: #2271A0;
+ font-weight: bold;
+ width: 13em;
+ line-height: normal;
+ font-size: 0.62em;
+ padding: 0;
+ margin: 0 0 0 2em;
}
#sidebar h6 {
- padding: 1.3em 0 0;
+ padding: 1.3em 0 0;
}
#sidebar p {
- color: #FFF;
- font-weight: normal;
+ color: #FFF;
+ font-weight: normal;
}
#sidebar a {
- display: block;
- width: 7em;
+ display: block;
+ width: 7em;
}
/* ------------------Main Content--------------------------- */
#mainContent {
- background: #BBB url("img/navbasebg.jpg") repeat-x top;
- color: black;
- width: auto;
- overflow: hidden;
- padding: 1em 0 0;
+ background: #BBB url("img/navbasebg.jpg") repeat-x top;
+ color: black;
+ width: auto;
+ overflow: hidden;
+ padding: 1em 0 0;
}
#mainContent div {
- clear: both;
- padding: 1em 0 0;
- overflow: hidden;
+ clear: both;
+ padding: 1em 0 0;
+ overflow: hidden;
}
#mainContent .fauxTable {
- margin: 1em 0 0;
- padding: 0;
+ margin: 1em 0 0;
+ padding: 0;
}
#ourTeam .fauxTable {
- clear: none;
- float: left;
- height: 18.81em;
- margin: 0;
+ clear: none;
+ float: left;
+ height: 18.81em;
+ margin: 0;
}
#ourTeam h2 {
- background: none;
+ background: none;
}
#platforms a {
- text-decoration: underline;
+ text-decoration: underline;
}
/* ------------------Footer--------------------------- */
#footer h6,
#footer p,
#footer a {
- font-size: 0.68em;
- color: white;
+ font-size: 0.68em;
+ color: white;
}
#footer h6 {
- padding: 1em 0 0 0;
+ padding: 1em 0 0 0;
}
#footer p {
- text-align: left;
+ text-align: left;
}
#footer a {
- width: 11.3em;
- display: block;
+ width: 11.3em;
+ display: block;
}
#footer a.baseline {
- float: right;
- margin-top: -1.5em;
- font-size: 0.625em;
- width: 19em;
- display: inline;
+ float: right;
+ margin-top: -1.5em;
+ font-size: 0.625em;
+ width: 19em;
+ display: inline;
}
/* ------------------Common classes--------------------------- */
.floatLeft {
- float: left;
- clear: left;
- margin-right: 1em;
+ float: left;
+ clear: left;
+ margin-right: 1em;
}
.floatRight {
- float: right;
- clear: right;
- margin-left: 1em;
+ float: right;
+ clear: right;
+ margin-left: 1em;
}
.fauxTable{
- border: 0.19em ridge #BBB;
- margin: 0;
- padding: 0;
+ border: 0.19em ridge #BBB;
+ margin: 0;
+ padding: 0;
}
.fauxTable h2 {
- border-bottom: 0.19em ridge #BBB;
- text-align: center;
- margin: 0;
- padding: 0.37em 1em;
- background: #999;
+ border-bottom: 0.19em ridge #BBB;
+ text-align: center;
+ margin: 0;
+ padding: 0.37em 1em;
+ background: #999;
}
.containCentered {
- text-align: center;
+ text-align: center;
}
.centered{
- margin: 0 auto;
- text-align: left;
+ margin: 0 auto;
+ text-align: left;
}
hooks/post-receive
--
clonekeenplus
|
|
From: New Y. <ny...@us...> - 2011-12-10 16:42:01
|
via a73fa2a94b888612b7c8d1ad18abcc5cd7f5b60e (commit)
from a4a0b0f5603a9898e5eb6f08c39733ac2e56193b (commit)
- Log -----------------------------------------------------------------
commit a73fa2a94b888612b7c8d1ad18abcc5cd7f5b60e
Author: New York <ny...@ho...>
Date: Sat Dec 10 18:41:10 2011 +0200
A sample rate of 49716Hz can now be set. This results in a more accurate OPL emulation. More may still be left to do.
-----------------------------------------------------------------------
Summary of changes:
src/common/Menu/CAudioSettings.cpp | 4 +++-
src/sdl/sound/CSound.cpp | 1 +
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/common/Menu/CAudioSettings.cpp b/src/common/Menu/CAudioSettings.cpp
index 14ad22b..3108cbe 100644
--- a/src/common/Menu/CAudioSettings.cpp
+++ b/src/common/Menu/CAudioSettings.cpp
@@ -31,6 +31,7 @@ m_must_restart_sounddriver(false)
else if( m_Rate == 22050 ) mp_Dialog->m_dlgobject.at(0)->m_Option->m_value = 2;
else if( m_Rate == 44100 ) mp_Dialog->m_dlgobject.at(0)->m_Option->m_value = 3;
else if( m_Rate == 48000 ) mp_Dialog->m_dlgobject.at(0)->m_Option->m_value = 4;
+ else if( m_Rate == 49716 ) mp_Dialog->m_dlgobject.at(0)->m_Option->m_value = 5;
m_Format = g_pSound->getAudioSpec().format;
std::string buf;
@@ -110,7 +111,7 @@ void CAudioSettings::processSpecific()
if(m_current == 0)
{
mp_Dialog->m_min = 1;
- mp_Dialog->m_max = 4;
+ mp_Dialog->m_max = 5;
setFrequencyFromSlot(mp_Dialog->m_dlgobject.at(0)->m_Option->m_value);
mp_Dialog->setObjectText(0, "Rate: " + itoa(m_Rate) + " kHz");
}
@@ -179,6 +180,7 @@ void CAudioSettings::setFrequencyFromSlot(int value)
case 2: m_Rate = 22050; break;
case 3: m_Rate = 44100; break;
case 4: m_Rate = 48000; break;
+ case 5: m_Rate = 49716; break;
}
}
diff --git a/src/sdl/sound/CSound.cpp b/src/sdl/sound/CSound.cpp
index 59406a2..128a48b 100644
--- a/src/sdl/sound/CSound.cpp
+++ b/src/sdl/sound/CSound.cpp
@@ -360,6 +360,7 @@ void CSound::setSoundmode(int freq, bool stereo, Uint16 format)
case 22050:
case 44100:
case 48000:
+ case 49716:
AudioSpec.freq = freq;
break;
default:
hooks/post-receive
--
clonekeenplus
|
|
From: New Y. <ny...@us...> - 2011-12-10 09:54:32
|
via a4a0b0f5603a9898e5eb6f08c39733ac2e56193b (commit)
from 88dfb2a1b88f85e01e47f635a98db62180ce8534 (commit)
- Log -----------------------------------------------------------------
commit a4a0b0f5603a9898e5eb6f08c39733ac2e56193b
Author: New York <ny...@ho...>
Date: Sat Dec 10 11:50:10 2011 +0200
PC Speaker related code has been a little reorganized. Partially more similar to earlier versions and partially less...
-----------------------------------------------------------------------
Summary of changes:
src/common/CAudioResources.h | 92 ++++++++++++++++++++++++--------
src/engine/galaxy/CAudioGalaxy.cpp | 24 +++-----
src/engine/vorticon/CAudioVorticon.cpp | 18 +------
3 files changed, 80 insertions(+), 54 deletions(-)
diff --git a/src/common/CAudioResources.h b/src/common/CAudioResources.h
index 49f2a88..f78f233 100644
--- a/src/common/CAudioResources.h
+++ b/src/common/CAudioResources.h
@@ -113,37 +113,59 @@ public:
virtual void unloadSound() = 0;
template <typename T>
- void generateWave(std::vector<T> &waveform, word sample, word prevsample, Uint64 &freqtimer, bool IsSigned, bool isDiscrete, const int& AMP, unsigned int samplesPer1000Seconds)
+ void generateWave(std::vector<T> &waveform, byte *inBuffer, unsigned int numOfBeeps, bool isVorticons, const int& AMP)
{
/** If PC_SPEAKER_WORKS_LIKE_DOSBOX_V0_74 is defined, we attempt
* to simulate the way vanilla DOSBox v0.74 emulates the PC Speaker.
* Might be useful for some Commander Keen packs with alternate sounds effects.
*/
- const unsigned int wavetime = m_AudioSpec.freq*1000/samplesPer1000Seconds;
- T wave;
- #ifdef PC_SPEAKER_WORKS_LIKE_DOSBOX_V0_74
- if (prevsample != 0)
- freqtimer %= m_AudioSpec.freq*prevsample/PCSpeakerTime;
- #else
- /** On Keen 1-3, separated consecutive samples are always separated.
- * On Keen 4-6, though, consecutive samples of the exact sample frequency
- * are merged into a single tone. So, we check if we need to begin a new tone.
+ Uint64 freqtimer = 0;
+ word prevsample = 0, sample;
+ T wave = m_AudioSpec.silence - AMP;
+ if (isVorticons)
+ {
+ const unsigned int wavetime = m_AudioSpec.freq*1000/145575;
+ for (sample = READWORD(inBuffer); sample != 0xffff; sample = READWORD(inBuffer))
+ {
+ #ifdef PC_SPEAKER_WORKS_LIKE_DOSBOX_V0_74
+ if (prevsample != 0)
+ freqtimer %= m_AudioSpec.freq*prevsample;
+ #else
+ // On Keen 1-3, separated consecutive samples are always separated.
+ wave = m_AudioSpec.silence - AMP;
+ freqtimer = 0;
+ #endif
+ generateBeep(waveform, sample, wave, freqtimer, AMP, wavetime, (m_AudioSpec.freq>>1)*Uint64(sample));
+ prevsample = sample;
+ }
+ }
+ /** Effective number of samples is actually size-1, so we enumerate from 1.
+ * Reason: The vanilla way, right after beginning the very last sample output,
+ * it's stopped. (That should be validated in some way...)
*/
- if (isDiscrete || (prevsample != sample))
- freqtimer = 0;
- #endif
- if (sample == 0)
- wave = m_AudioSpec.silence - AMP;
- for (unsigned int j=0; j<wavetime; j++)
+ else
{
- if (sample != 0)
+ const unsigned int wavetime = m_AudioSpec.freq*1000/140026;
+ for(unsigned pos=1 ; pos<numOfBeeps ; pos++)
{
- wave = m_AudioSpec.silence + (((((PCSpeakerTime<<1)*freqtimer/m_AudioSpec.freq/sample)%2)<<1)-1)*AMP;
- freqtimer++;
+ // Multiplying by some constant (60 in our case) seems to reproduces the right sound.
+ sample = *(inBuffer++) * 60;
+ #ifdef PC_SPEAKER_WORKS_LIKE_DOSBOX_V0_74
+ if (prevsample != 0)
+ freqtimer %= m_AudioSpec.freq*prevsample;
+ #else
+ /** On Keen 4-6, consecutive samples of the exact
+ * same frequency are merged into a single tone.
+ */
+ if (prevsample != sample)
+ {
+ wave = m_AudioSpec.silence - AMP;
+ freqtimer = 0;
+ }
+ #endif
+ generateBeep(waveform, sample, wave, freqtimer, AMP, wavetime, (m_AudioSpec.freq>>1)*Uint64(sample));
+ prevsample = sample;
}
- // Do add.
- for(Uint8 chnl=0 ; chnl<m_AudioSpec.channels ; chnl++ )
- waveform.push_back(wave);
}
}
@@ -156,6 +178,32 @@ public:
protected:
std::vector<CSoundSlot>m_soundslot;
const SDL_AudioSpec &m_AudioSpec;
+
+private:
+ template <typename T>
+ void generateBeep(std::vector<T> &waveform, word sample, T &wave, Uint64 &freqtimer, const int& AMP, const unsigned int& wavetime, const Uint64& changerate)
+ {
+ if (sample != 0)
+ for (unsigned int j=0; j<wavetime; j++)
+ {
+ if (freqtimer > changerate)
+ {
+ freqtimer %= changerate;
+
+ if (wave == m_AudioSpec.silence - AMP)
+ wave = m_AudioSpec.silence + AMP;
+ else
+ wave = m_AudioSpec.silence - AMP;
+ }
+ freqtimer += PCSpeakerTime;
+
+ for(Uint8 chnl=0 ; chnl<m_AudioSpec.channels ; chnl++ )
+ waveform.push_back(wave);
+ }
+ else
+ for (unsigned int j=0; j<wavetime*m_AudioSpec.channels; j++)
+ waveform.push_back(wave);
+ }
};
#endif /* CAUDIORESOURCES_H_ */
diff --git a/src/engine/galaxy/CAudioGalaxy.cpp b/src/engine/galaxy/CAudioGalaxy.cpp
index ded9ce8..b06f260 100644
--- a/src/engine/galaxy/CAudioGalaxy.cpp
+++ b/src/engine/galaxy/CAudioGalaxy.cpp
@@ -30,28 +30,22 @@ bool CAudioGalaxy::readPCSpeakerSoundintoWaveForm(CSoundSlot &soundslot, const b
soundslot.setupAudioSpec(&m_AudioSpec);
std::vector<Sint16> waveform;
- Uint64 freqtimer = 0;
- int AMP = (formatsize == 2) ? 0x4000 : 0x40;
- word prevsample = 0;
-
- // Effective number of samples is actually size-1, so we enumerate from 1.
- // Reason: The vanilla way, right after beginning the very last sample output,
- // it's stopped. (That should be validated in some way...)
- for(unsigned pos=1 ; pos<size ; pos++ )
- {
- // Multiplying by some constant (60 in our case) seems to reproduces the right sound.
- word sample = *(pcsdata_ptr++) * 60;
- generateWave(waveform, sample, prevsample, freqtimer, true, false, AMP, 140026);
- prevsample = sample;
- }
+ // There should be a better way of determining if sound is signed or not...
+ int AMP;
+ if ((m_AudioSpec.format == AUDIO_S8) || (m_AudioSpec.format == AUDIO_S16))
+ AMP = ((((1<<(formatsize*8))>>2)-1)*PC_Speaker_Volume)/100;
+ else
+ AMP = ((((1<<(formatsize*8))>>1)-1)*PC_Speaker_Volume)/100;
+ //int AMP = ((IsSigned ? ((1<<(formatsize*8))>>2)-1 : (1<<(formatsize*8)>>1)-1)*PC_Speaker_Volume)/100;
+ generateWave(waveform, pcsdata_ptr, size, false, AMP);
if(formatsize == 1)
{
std::vector<Uint8> wave8;
std::vector<Sint16>::iterator it = waveform.begin();
for( ; it != waveform.end(); it++ )
- wave8.push_back((*it) + m_AudioSpec.silence);
+ wave8.push_back(*it);
soundslot.setupWaveForm((Uint8*)&wave8[0], wave8.size()*sizeof(Uint8));
}
else
diff --git a/src/engine/vorticon/CAudioVorticon.cpp b/src/engine/vorticon/CAudioVorticon.cpp
index 95f17f5..b98aaf0 100644
--- a/src/engine/vorticon/CAudioVorticon.cpp
+++ b/src/engine/vorticon/CAudioVorticon.cpp
@@ -109,24 +109,8 @@ bool CAudioVorticon::loadPCSpeakerSound(Uint8 *buffer, const Uint32 buf_size,
{
buf_ptr = buffer+offset;
- word prevsample = 0, sample;
const int AMP = ((IsSigned ? ((1<<(sizeof(T)*8))>>2)-1 : (1<<(sizeof(T)*8)>>1)-1)*PC_Speaker_Volume)/100;
- T wave = AMP;
-
- Uint64 freqtimer = 0;
-
- do
- {
- sample = READWORD(buf_ptr);
-
- if(sample == 0xffff)
- break;
-
- generateWave(waveform, sample, prevsample, freqtimer, IsSigned, true, AMP, 145575);
- prevsample = sample;
-
-
- }while(1);
+ generateWave(waveform, buf_ptr, 0, true, AMP);
g_pLogFile->ftextOut("CAudioVorticon::loadSound : loaded sound %s into the waveform.<br>", searchname.c_str());
return true;
hooks/post-receive
--
clonekeenplus
|
|
From: Gerstrong <ger...@us...> - 2011-11-17 07:49:22
|
via 88dfb2a1b88f85e01e47f635a98db62180ce8534 (commit)
from 972d6c5a748f3c7271c852af13d0c1d87e678bf0 (commit)
- Log -----------------------------------------------------------------
commit 88dfb2a1b88f85e01e47f635a98db62180ce8534
Author: Gerhard Stein <ger...@gm...>
Date: Thu Nov 17 08:54:55 2011 +0100
Albert Zeyer Hint : Now we have finally introduced the recursive source file search in cmake. I wanted to add this long time ago. Now it's in!
-----------------------------------------------------------------------
Summary of changes:
build.cmake | 39 +--------------------------------------
1 files changed, 1 insertions(+), 38 deletions(-)
diff --git a/build.cmake b/build.cmake
index e75b81b..b00ab28 100644
--- a/build.cmake
+++ b/build.cmake
@@ -135,42 +135,7 @@ configure_file(readme.txt.in readme.txt)
INCLUDE_DIRECTORIES(optional-includes/generated)
INCLUDE_DIRECTORIES(src)
-AUX_SOURCE_DIRECTORY(src ROOT_S)
-AUX_SOURCE_DIRECTORY(src/core CORE_S)
-AUX_SOURCE_DIRECTORY(src/common COMMON_S)
-AUX_SOURCE_DIRECTORY(src/common/Menu MENU_S)
-AUX_SOURCE_DIRECTORY(src/dialog DIALOG_S)
-AUX_SOURCE_DIRECTORY(src/engine ENGINE_S)
-AUX_SOURCE_DIRECTORY(src/engine/galaxy GALAXY_S)
-AUX_SOURCE_DIRECTORY(src/engine/galaxy/ai GALAXY_AI_S)
-AUX_SOURCE_DIRECTORY(src/engine/galaxy/ai/ep4 GALAXY_AI_EP4_S)
-AUX_SOURCE_DIRECTORY(src/engine/galaxy/ai/platform GALAXY_AI_PLATFORMS_S)
-AUX_SOURCE_DIRECTORY(src/engine/galaxy/dialog GALAXY_DIALOG_S)
-AUX_SOURCE_DIRECTORY(src/engine/infoscenes INFOSCENES_S)
-AUX_SOURCE_DIRECTORY(src/engine/playgame PLAYGAME_S)
-AUX_SOURCE_DIRECTORY(src/engine/vorticon VORTICON_S)
-AUX_SOURCE_DIRECTORY(src/engine/vorticon/ai AI_S)
-AUX_SOURCE_DIRECTORY(src/engine/vorticon/dialog VORT_DIALOG_S)
-AUX_SOURCE_DIRECTORY(src/engine/vorticon/finale FINALE_S)
-AUX_SOURCE_DIRECTORY(src/engine/vorticon/playgame VPLAYGAME_S)
-AUX_SOURCE_DIRECTORY(src/fileio FILEIO_S)
-AUX_SOURCE_DIRECTORY(src/fileio/compression COMPRESSION_S)
-AUX_SOURCE_DIRECTORY(src/graphics GRAPHICS_S)
-AUX_SOURCE_DIRECTORY(src/graphics/effects EFFECTS_S)
-AUX_SOURCE_DIRECTORY(src/scale2x SCALE2X_S)
-AUX_SOURCE_DIRECTORY(src/sdl SDL_S)
-AUX_SOURCE_DIRECTORY(src/sdl/sound SDLSOUND_S)
-AUX_SOURCE_DIRECTORY(src/sdl/music SDLMUSIC_S)
-AUX_SOURCE_DIRECTORY(src/sdl/sys SDLSYS_S)
-AUX_SOURCE_DIRECTORY(src/sdl/video SDLVIDEO_S)
-AUX_SOURCE_DIRECTORY(src/hardware HARDWARE_S)
-
-SET(ALL_SRCS ${COMMON_S} ${CORE_S} ${MENU_S} ${DIALOG_S} ${ENGINE_S}
- ${AI_S} ${GALAXY_S} ${GALAXY_AI_S} ${GALAXY_AI_PLATFORMS_S} ${GALAXY_AI_EP4_S}
- ${GALAXY_DIALOG_S} ${INFOSCENES_S} ${PLAYGAME_S}
- ${VORTICON_S} ${VORT_DIALOG_S} ${FINALE_S} ${VPLAYGAME_S} ${FILEIO_S}
- ${COMPRESSION_S} ${GRAPHICS_S} ${EFFECTS_S} ${HARDWARE_S} ${SCALE2X_S} ${SDL_S} ${SDLSOUND_S} ${SDLMUSIC_S} ${SDLSYS_S}
- ${SDLVIDEO_S} ${ROOT_S})
+file(GLOB_RECURSE ALL_SRCS src/*.c*)
IF(UNIX)
# Compilation under Linux
@@ -330,9 +295,7 @@ MESSAGE( "BUILD_TYPE = ${BUILD_TYPE}" )
MESSAGE( "BUILD_DIR = ${BUILD_DIR}" )
MESSAGE( "DEBUG = ${DEBUG}" )
MESSAGE( "CMAKE_C_COMPILER = ${CMAKE_C_COMPILER}" )
-#MESSAGE( "CMAKE_C_FLAGS = ${CMAKE_C_FLAGS}" )
MESSAGE( "CMAKE_CXX_COMPILER = ${CMAKE_CXX_COMPILER}" )
-#MESSAGE( "CMAKE_CXX_FLAGS = ${CMAKE_CXX_FLAGS}" )
MESSAGE( "CMAKE_PREFIX_PATH = ${CMAKE_PREFIX_PATH}" )
MESSAGE( "CMAKE_FIND_ROOT_PATH = ${CMAKE_FIND_ROOT_PATH}" )
MESSAGE( "CMAKE_INCLUDE_PATH = ${CMAKE_INCLUDE_PATH}" )
hooks/post-receive
--
clonekeenplus
|
|
From: Gerstrong <ger...@us...> - 2011-11-16 18:15:28
|
via 972d6c5a748f3c7271c852af13d0c1d87e678bf0 (commit)
from db5c35368163d9cb093ece2d6fba8140e9f913f6 (commit)
- Log -----------------------------------------------------------------
commit 972d6c5a748f3c7271c852af13d0c1d87e678bf0
Author: Gerhard Stein <ger...@gm...>
Date: Wed Nov 16 19:21:33 2011 +0100
DrawEvents.h file added to fix some bugs
-----------------------------------------------------------------------
Summary of changes:
src/sdl/video/DrawEvents.h | 62 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 0 deletions(-)
create mode 100644 src/sdl/video/DrawEvents.h
diff --git a/src/sdl/video/DrawEvents.h b/src/sdl/video/DrawEvents.h
new file mode 100644
index 0000000..242dc74
--- /dev/null
+++ b/src/sdl/video/DrawEvents.h
@@ -0,0 +1,62 @@
+/*
+ * DrawEvents.h
+ *
+ * Created on: 29.10.2011
+ * Author: gerstrong
+ *
+ * This header file will hold all the draw events that are used during the gameplay
+ */
+
+#ifndef DRAWEVENTS_H_
+#define DRAWEVENTS_H_
+
+#include "engine/CEvent.h"
+#include "graphics/CSprite.h"
+#include "graphics/CTilemap.h"
+//#include "gui/CGUIDialog.h"
+
+
+// GUI Based Draw Task
+
+/*struct DrawGUIRenderTask : CEvent
+{
+ CGUIDialog *mpDialog;
+
+ DrawGUIRenderTask(CGUIDialog *pDialog) : mpDialog(pDialog) {}
+};*/
+
+// Tile based Draw Tasks
+
+struct DrawAnimatedTileTask : CEvent
+{
+ CTilemap *mTileMapPtr;
+ const Uint16 mx, my;
+ const Uint16 mtile;
+
+ DrawAnimatedTileTask(CTilemap *TileMapPtr, const Uint16 x, const Uint16 y, const Uint16 tile) :
+ mTileMapPtr(TileMapPtr), mx(x), my(y), mtile(tile) {}
+};
+
+// Sprite based Draw Tasks
+
+struct DrawBlinkingSpriteTask : CEvent
+{
+ CSprite *mSpritePtr;
+ const Uint16 mx, my;
+ DrawBlinkingSpriteTask(CSprite *SpritePtr, const Uint16 x, const Uint16 y) :
+ mSpritePtr(SpritePtr), mx(x), my(y) {}
+};
+
+
+
+struct DrawSpriteTask : CEvent
+{
+ CSprite *mSpritePtr;
+ const Uint16 mx, my;
+ const Uint8 mAlpha;
+ DrawSpriteTask(CSprite *SpritePtr, const Uint16 x, const Uint16 y, const Uint8 alpha) :
+ mSpritePtr(SpritePtr), mx(x), my(y), mAlpha(alpha) {}
+};
+
+
+#endif /* DRAWEVENTS_H_ */
hooks/post-receive
--
clonekeenplus
|
|
From: Gerstrong <ger...@us...> - 2011-11-16 16:08:39
|
via db5c35368163d9cb093ece2d6fba8140e9f913f6 (commit)
from 8acd4d65cad6ce6fdeee64741f56020959b75b0a (commit)
- Log -----------------------------------------------------------------
commit db5c35368163d9cb093ece2d6fba8140e9f913f6
Author: Gerhard Stein <ger...@gm...>
Date: Wed Nov 16 17:07:25 2011 +0100
Some small fixes and NY Hints for better sounds
-----------------------------------------------------------------------
Summary of changes:
src/common/CAudioResources.h | 8 ++++----
src/engine/galaxy/CAudioGalaxy.cpp | 13 +++++--------
src/engine/vorticon/CAudioVorticon.cpp | 2 +-
3 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/common/CAudioResources.h b/src/common/CAudioResources.h
index ff4441b..49f2a88 100644
--- a/src/common/CAudioResources.h
+++ b/src/common/CAudioResources.h
@@ -113,17 +113,17 @@ public:
virtual void unloadSound() = 0;
template <typename T>
- void generateWave(std::vector<T> &waveform, word sample, word prevsample, Uint64 &freqtimer, bool IsSigned, bool isDiscrete, const int& AMP)
+ void generateWave(std::vector<T> &waveform, word sample, word prevsample, Uint64 &freqtimer, bool IsSigned, bool isDiscrete, const int& AMP, unsigned int samplesPer1000Seconds)
{
/** If PC_SPEAKER_WORKS_LIKE_DOSBOX_V0_74 is defined, we attempt
* to simulate the way vanilla DOSBox v0.74 emulates the PC Speaker.
* Might be useful for some Commander Keen packs with alternate sounds effects.
*/
- const unsigned int wavetime = m_AudioSpec.freq/146;
+ const unsigned int wavetime = m_AudioSpec.freq*1000/samplesPer1000Seconds;
T wave;
#ifdef PC_SPEAKER_WORKS_LIKE_DOSBOX_V0_74
- if (sample != 0)
- freqtimer %= m_AudioSpec.freq*sample/PCSpeakerTime;
+ if (prevsample != 0)
+ freqtimer %= m_AudioSpec.freq*prevsample/PCSpeakerTime;
#else
/** On Keen 1-3, separated consecutive samples are always separated.
* On Keen 4-6, though, consecutive samples of the exact sample frequency
diff --git a/src/engine/galaxy/CAudioGalaxy.cpp b/src/engine/galaxy/CAudioGalaxy.cpp
index 080b40b..ded9ce8 100644
--- a/src/engine/galaxy/CAudioGalaxy.cpp
+++ b/src/engine/galaxy/CAudioGalaxy.cpp
@@ -29,22 +29,19 @@ bool CAudioGalaxy::readPCSpeakerSoundintoWaveForm(CSoundSlot &soundslot, const b
soundslot.priority = READWORD(pcsdata_ptr);
soundslot.setupAudioSpec(&m_AudioSpec);
-
- std::vector<Sint16> waveform;
- Uint64 freqtimer = 0;
- int AMP = (formatsize == 2) ? 0x4000 : 0x40;
- Sint16 wave = AMP;
-
std::vector<Sint16> waveform;
Uint64 freqtimer = 0;
int AMP = (formatsize == 2) ? 0x4000 : 0x40;
word prevsample = 0;
- for(unsigned pos=0 ; pos<size ; pos++ )
+ // Effective number of samples is actually size-1, so we enumerate from 1.
+ // Reason: The vanilla way, right after beginning the very last sample output,
+ // it's stopped. (That should be validated in some way...)
+ for(unsigned pos=1 ; pos<size ; pos++ )
{
// Multiplying by some constant (60 in our case) seems to reproduces the right sound.
word sample = *(pcsdata_ptr++) * 60;
- generateWave(waveform, sample, prevsample, freqtimer, true, false, AMP);
+ generateWave(waveform, sample, prevsample, freqtimer, true, false, AMP, 140026);
prevsample = sample;
}
diff --git a/src/engine/vorticon/CAudioVorticon.cpp b/src/engine/vorticon/CAudioVorticon.cpp
index 838b892..95f17f5 100644
--- a/src/engine/vorticon/CAudioVorticon.cpp
+++ b/src/engine/vorticon/CAudioVorticon.cpp
@@ -122,7 +122,7 @@ bool CAudioVorticon::loadPCSpeakerSound(Uint8 *buffer, const Uint32 buf_size,
if(sample == 0xffff)
break;
- generateWave(waveform, sample, prevsample, freqtimer, IsSigned, true, AMP);
+ generateWave(waveform, sample, prevsample, freqtimer, IsSigned, true, AMP, 145575);
prevsample = sample;
hooks/post-receive
--
clonekeenplus
|
|
From: Gerstrong <ger...@us...> - 2011-11-13 18:29:06
|
via 8acd4d65cad6ce6fdeee64741f56020959b75b0a (commit)
from 93abb3e458b4d17ecbe484f3b8ae9a123100ea5d (commit)
- Log -----------------------------------------------------------------
commit 8acd4d65cad6ce6fdeee64741f56020959b75b0a
Author: Gerhard Stein <ger...@gm...>
Date: Sun Nov 13 19:35:34 2011 +0100
More patches by NY. Now we should have all of them
-----------------------------------------------------------------------
Summary of changes:
src/engine/galaxy/CAudioGalaxy.cpp | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/engine/galaxy/CAudioGalaxy.cpp b/src/engine/galaxy/CAudioGalaxy.cpp
index ae05cec..080b40b 100644
--- a/src/engine/galaxy/CAudioGalaxy.cpp
+++ b/src/engine/galaxy/CAudioGalaxy.cpp
@@ -35,13 +35,20 @@ bool CAudioGalaxy::readPCSpeakerSoundintoWaveForm(CSoundSlot &soundslot, const b
int AMP = (formatsize == 2) ? 0x4000 : 0x40;
Sint16 wave = AMP;
+ std::vector<Sint16> waveform;
+ Uint64 freqtimer = 0;
+ int AMP = (formatsize == 2) ? 0x4000 : 0x40;
+ word prevsample = 0;
+
for(unsigned pos=0 ; pos<size ; pos++ )
{
- // I don't know why we have to shift 6 bytes, but it reproduces the right sound!
- word sample = *(pcsdata_ptr++);
- generateWave(waveform, sample<<6, wave, freqtimer, true, AMP);
+ // Multiplying by some constant (60 in our case) seems to reproduces the right sound.
+ word sample = *(pcsdata_ptr++) * 60;
+ generateWave(waveform, sample, prevsample, freqtimer, true, false, AMP);
+ prevsample = sample;
}
+
if(formatsize == 1)
{
std::vector<Uint8> wave8;
hooks/post-receive
--
clonekeenplus
|
|
From: Gerstrong <ger...@us...> - 2011-11-13 18:16:48
|
via 93abb3e458b4d17ecbe484f3b8ae9a123100ea5d (commit)
from a1a9cc272315b234de3f492ce976d047355f512b (commit)
- Log -----------------------------------------------------------------
commit 93abb3e458b4d17ecbe484f3b8ae9a123100ea5d
Author: Gerhard Stein <ger...@gm...>
Date: Sun Nov 13 19:23:04 2011 +0100
Patches for better PC Speaker Sound by NY
-----------------------------------------------------------------------
Summary of changes:
src/engine/vorticon/CAudioVorticon.cpp | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/engine/vorticon/CAudioVorticon.cpp b/src/engine/vorticon/CAudioVorticon.cpp
index 418fdca..838b892 100644
--- a/src/engine/vorticon/CAudioVorticon.cpp
+++ b/src/engine/vorticon/CAudioVorticon.cpp
@@ -109,9 +109,10 @@ bool CAudioVorticon::loadPCSpeakerSound(Uint8 *buffer, const Uint32 buf_size,
{
buf_ptr = buffer+offset;
- word sample;
+ word prevsample = 0, sample;
const int AMP = ((IsSigned ? ((1<<(sizeof(T)*8))>>2)-1 : (1<<(sizeof(T)*8)>>1)-1)*PC_Speaker_Volume)/100;
T wave = AMP;
+
Uint64 freqtimer = 0;
do
@@ -121,7 +122,9 @@ bool CAudioVorticon::loadPCSpeakerSound(Uint8 *buffer, const Uint32 buf_size,
if(sample == 0xffff)
break;
- generateWave(waveform, sample, wave, freqtimer, IsSigned, AMP);
+ generateWave(waveform, sample, prevsample, freqtimer, IsSigned, true, AMP);
+ prevsample = sample;
+
}while(1);
g_pLogFile->ftextOut("CAudioVorticon::loadSound : loaded sound %s into the waveform.<br>", searchname.c_str());
hooks/post-receive
--
clonekeenplus
|
|
From: Gerstrong <ger...@us...> - 2011-11-13 17:57:23
|
via a1a9cc272315b234de3f492ce976d047355f512b (commit)
via 4fbc4aa3504d50e392401af90fcbc06f20cc079c (commit)
from bb18414e257a257ab7e25a7d9d9aa3337a6cf2b6 (commit)
- Log -----------------------------------------------------------------
commit a1a9cc272315b234de3f492ce976d047355f512b
Author: Gerhard Stein <ger...@gm...>
Date: Sun Nov 13 19:01:51 2011 +0100
NY Patch applied for better PC Speaker sound
commit 4fbc4aa3504d50e392401af90fcbc06f20cc079c
Author: Gerhard Stein <ger...@gm...>
Date: Sun Oct 30 17:18:45 2011 +0100
Small cleanups
-----------------------------------------------------------------------
Summary of changes:
src/common/CAudioResources.h | 50 ++++++++++++-----------
src/common/CMap.cpp | 3 +-
src/engine/vorticon/dialog/CMessageBoxVort.cpp | 3 +-
src/sdl/CVideoDriver.cpp | 12 ++++++
4 files changed, 42 insertions(+), 26 deletions(-)
diff --git a/src/common/CAudioResources.h b/src/common/CAudioResources.h
index c06015b..ff4441b 100644
--- a/src/common/CAudioResources.h
+++ b/src/common/CAudioResources.h
@@ -21,8 +21,8 @@
*/
const int PC_Speaker_Volume = 20; // in percent
-const Uint64 PCSpeakerTime = 1288634;
-//const Uint64 PCSpeakerTime = 0x1234DD;
+//const Uint64 PCSpeakerTime = 1288634;
+const Uint64 PCSpeakerTime = 0x1234DD;
typedef struct
{
@@ -113,33 +113,35 @@ public:
virtual void unloadSound() = 0;
template <typename T>
- void generateWave(std::vector<T> &waveform, word sample, T &wave, Uint64 &freqtimer, bool IsSigned, const int& AMP)
+ void generateWave(std::vector<T> &waveform, word sample, word prevsample, Uint64 &freqtimer, bool IsSigned, bool isDiscrete, const int& AMP)
{
- const unsigned int wavetime = m_AudioSpec.freq/136;
- Uint64 changerate = (m_AudioSpec.freq>>1)*Uint64(sample);
-
+ /** If PC_SPEAKER_WORKS_LIKE_DOSBOX_V0_74 is defined, we attempt
+ * to simulate the way vanilla DOSBox v0.74 emulates the PC Speaker.
+ * Might be useful for some Commander Keen packs with alternate sounds effects.
+ */
+ const unsigned int wavetime = m_AudioSpec.freq/146;
+ T wave;
+ #ifdef PC_SPEAKER_WORKS_LIKE_DOSBOX_V0_74
+ if (sample != 0)
+ freqtimer %= m_AudioSpec.freq*sample/PCSpeakerTime;
+ #else
+ /** On Keen 1-3, separated consecutive samples are always separated.
+ * On Keen 4-6, though, consecutive samples of the exact sample frequency
+ * are merged into a single tone. So, we check if we need to begin a new tone.
+ */
+ if (isDiscrete || (prevsample != sample))
+ freqtimer = 0;
+ #endif
+ if (sample == 0)
+ wave = m_AudioSpec.silence - AMP;
for (unsigned int j=0; j<wavetime; j++)
{
- if(changerate == 0)
- {
- wave = m_AudioSpec.silence - AMP;
- freqtimer = 0;
- }
- else
+ if (sample != 0)
{
- if (freqtimer > changerate)
- {
- freqtimer = 0;
-
- if (wave == m_AudioSpec.silence - AMP)
- wave = m_AudioSpec.silence + AMP;
- else
- wave = m_AudioSpec.silence - AMP;
- }
- else
- freqtimer += PCSpeakerTime;
+ wave = m_AudioSpec.silence + (((((PCSpeakerTime<<1)*freqtimer/m_AudioSpec.freq/sample)%2)<<1)-1)*AMP;
+ freqtimer++;
}
-
+ // Do add.
for(Uint8 chnl=0 ; chnl<m_AudioSpec.channels ; chnl++ )
waveform.push_back(wave);
}
diff --git a/src/common/CMap.cpp b/src/common/CMap.cpp
index b1747a5..039e609 100644
--- a/src/common/CMap.cpp
+++ b/src/common/CMap.cpp
@@ -562,7 +562,8 @@ Uint8 CMap::getAnimtiletimer()
void CMap::drawAnimatedTile(SDL_Surface *dst, Uint16 mx, Uint16 my, Uint16 tile)
{
- m_Tilemaps.at(1).drawTile( dst, mx, my, tile );
+ g_pVideoDriver->mDrawTasks.add(
+ new DrawAnimatedTileTask(&(m_Tilemaps.at(1)),mx, my, tile ) );
}
void CMap::animateAllTiles()
diff --git a/src/engine/vorticon/dialog/CMessageBoxVort.cpp b/src/engine/vorticon/dialog/CMessageBoxVort.cpp
index 5512a7d..e936269 100644
--- a/src/engine/vorticon/dialog/CMessageBoxVort.cpp
+++ b/src/engine/vorticon/dialog/CMessageBoxVort.cpp
@@ -90,7 +90,8 @@ void CMessageBoxVort::process()
g_pGfxEngine->getFont(0).drawFont(sfc, m_Lines[i], m_boxrect.x+8, m_boxrect.y+((i+1)*8) );
// Draw additional tiles on the surface if any where defined
- for(size_t i=0 ; i<m_Tiles.size() ; i++) {
+ for(size_t i=0 ; i<m_Tiles.size() ; i++)
+ {
g_pGfxEngine->getTileMap(1).drawTile(sfc, m_boxrect.x+m_Tiles[i].x,
m_boxrect.y+m_Tiles[i].y, m_Tiles[i].tile);
}
diff --git a/src/sdl/CVideoDriver.cpp b/src/sdl/CVideoDriver.cpp
index 79b4022..4c08f02 100644
--- a/src/sdl/CVideoDriver.cpp
+++ b/src/sdl/CVideoDriver.cpp
@@ -455,6 +455,18 @@ void CVideoDriver::pollDrawingTasks()
drawSpriteTask->my );
}
+ // Tiles Section
+ else if( DrawAnimatedTileTask *drawAnimatedTileTask =
+ mDrawTasks.occurredEvent<DrawAnimatedTileTask>() )
+ {
+ CTilemap *TilemapPtr = drawAnimatedTileTask->mTileMapPtr;
+
+ TilemapPtr->drawTile(
+ getBlitSurface(),
+ drawAnimatedTileTask->mx,
+ drawAnimatedTileTask->my,
+ drawAnimatedTileTask->mtile);
+ }
// If none of the Events fit here, please warn this incident
else
hooks/post-receive
--
clonekeenplus
|
|
From: Gerstrong <ger...@us...> - 2011-10-29 13:12:26
|
via bb18414e257a257ab7e25a7d9d9aa3337a6cf2b6 (commit)
from ba482d85ad136ca494ed78dfc7aa5045fa77b7f3 (commit)
- Log -----------------------------------------------------------------
commit bb18414e257a257ab7e25a7d9d9aa3337a6cf2b6
Author: Gerhard Stein <ger...@gm...>
Date: Sat Oct 29 15:15:14 2011 +0200
BlinkingSprite now a Task also
-----------------------------------------------------------------------
Summary of changes:
src/common/CObject.cpp | 3 +--
src/graphics/CSprite.cpp | 13 ++++++++++++-
src/graphics/CSprite.h | 3 ++-
src/sdl/CVideoDriver.cpp | 15 ++++++++++++++-
4 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/src/common/CObject.cpp b/src/common/CObject.cpp
index b9e3496..fec047d 100644
--- a/src/common/CObject.cpp
+++ b/src/common/CObject.cpp
@@ -615,7 +615,6 @@ void CObject::draw()
return;
CSprite &Sprite = g_pGfxEngine->getSprite(sprite);
- SDL_Surface *sfc = g_pVideoDriver->getBlitSurface();
scrx = (m_Pos.x>>STC)-mp_Map->m_scrollx;
scry = (m_Pos.y>>STC)-mp_Map->m_scrolly;
@@ -628,7 +627,7 @@ void CObject::draw()
Uint16 showY = scry+Sprite.getYOffset();
if(m_blinktime > 0)
{
- Sprite.drawBlinkingSprite( sfc, showX, showY );
+ Sprite.drawBlinkingSprite( showX, showY );
m_blinktime--;
}
else
diff --git a/src/graphics/CSprite.cpp b/src/graphics/CSprite.cpp
index d65a752..12ad37f 100644
--- a/src/graphics/CSprite.cpp
+++ b/src/graphics/CSprite.cpp
@@ -324,11 +324,22 @@ void CSprite::_drawSprite( SDL_Surface *dst, const Uint16 x, const Uint16 y, con
/**
* \brief The function that blits the sprite to dst
+ * \param x X-Coordinate, indicating the position on dst
+ * \param y Y-Coordinate, indicating the position on dst
+ */
+void CSprite::drawBlinkingSprite( Uint16 x, Uint16 y )
+{
+ g_pVideoDriver->mDrawTasks.add( new DrawBlinkingSpriteTask( this, x, y ) );
+}
+
+
+/**
+ * \brief The function that blits the sprite to dst (lowlevel)
* \param SDL_Surface Surface where the sprite will be drawn
* \param x X-Coordinate, indicating the position on dst
* \param y Y-Coordinate, indicating the position on dst
*/
-void CSprite::drawBlinkingSprite( SDL_Surface *dst, Uint16 x, Uint16 y )
+void CSprite::_drawBlinkingSprite( SDL_Surface *dst, Uint16 x, Uint16 y )
{
SDL_Rect dst_rect, src_rect;
dst_rect.x = x; dst_rect.y = y;
diff --git a/src/graphics/CSprite.h b/src/graphics/CSprite.h
index 57a993b..7cc6274 100644
--- a/src/graphics/CSprite.h
+++ b/src/graphics/CSprite.h
@@ -35,7 +35,8 @@ public:
void drawSprite( const Uint16 x, const Uint16 y, const Uint8 alpha=255 );
void _drawSprite( SDL_Surface *dst, const Uint16 x, const Uint16 y, const Uint8 alpha=255 );
- void drawBlinkingSprite( SDL_Surface *dst, Uint16 x, Uint16 y );
+ void drawBlinkingSprite( Uint16 x, Uint16 y );
+ void _drawBlinkingSprite( SDL_Surface *dst, Uint16 x, Uint16 y );
Uint16 getXOffset() { return m_xoffset; }
Uint16 getYOffset() { return m_yoffset; }
diff --git a/src/sdl/CVideoDriver.cpp b/src/sdl/CVideoDriver.cpp
index d1e395d..79b4022 100644
--- a/src/sdl/CVideoDriver.cpp
+++ b/src/sdl/CVideoDriver.cpp
@@ -434,16 +434,29 @@ void CVideoDriver::pollDrawingTasks()
{
while(!mDrawTasks.empty())
{
+ // Sprite Section
if( DrawSpriteTask *drawSpriteTask = mDrawTasks.occurredEvent<DrawSpriteTask>() )
{
CSprite *Sprite = drawSpriteTask->mSpritePtr;
- Sprite->_drawSprite(getBlitSurface(),
+ Sprite->_drawSprite(
+ getBlitSurface(),
drawSpriteTask->mx,
drawSpriteTask->my,
drawSpriteTask->mAlpha);
+ }
+ else if( DrawBlinkingSpriteTask *drawSpriteTask = mDrawTasks.occurredEvent<DrawBlinkingSpriteTask>() )
+ {
+ CSprite *Sprite = drawSpriteTask->mSpritePtr;
+ Sprite->_drawBlinkingSprite(
+ getBlitSurface(),
+ drawSpriteTask->mx,
+ drawSpriteTask->my );
}
+
+
+ // If none of the Events fit here, please warn this incident
else
{
g_pLogFile->textOut("Warning: Unknown Drawing task. Please let the developers debug this!");
hooks/post-receive
--
clonekeenplus
|
|
From: Gerstrong <ger...@us...> - 2011-10-29 12:54:49
|
via ba482d85ad136ca494ed78dfc7aa5045fa77b7f3 (commit)
from 4c6fd3862a0c40e8e47d062ace864901a804f72c (commit)
- Log -----------------------------------------------------------------
commit ba482d85ad136ca494ed78dfc7aa5045fa77b7f3
Author: Gerhard Stein <ger...@gm...>
Date: Sat Oct 29 14:58:46 2011 +0200
Small cleanups
-----------------------------------------------------------------------
Summary of changes:
src/CGame.cpp | 7 ++-
src/common/CHUD.cpp | 4 +-
src/common/CObject.cpp | 17 +------
src/common/CStatusScreen.cpp | 6 +-
src/engine/CEvent.h | 3 +-
src/engine/CEventContainer.h | 1 +
src/engine/vorticon/playgame/CPlayGameVorticon.cpp | 2 -
src/engine/vorticon/playgame/CPlayGameWorldMap.cpp | 2 +-
src/graphics/CSprite.cpp | 13 +++++-
src/graphics/CSprite.h | 3 +-
src/sdl/CVideoDriver.cpp | 43 ++++++++++++++++++++
src/sdl/CVideoDriver.h | 8 ++++
src/sdl/video/CVideoEngine.cpp | 1 +
src/sdl/video/CVideoEngine.h | 3 +-
14 files changed, 83 insertions(+), 30 deletions(-)
diff --git a/src/CGame.cpp b/src/CGame.cpp
index a5d3ce8..09f686e 100644
--- a/src/CGame.cpp
+++ b/src/CGame.cpp
@@ -118,8 +118,8 @@ void CGame::run()
// Render the Screen
if (g_pTimer->TimeToRender())
{
-
- // TODO: Here we try to process all the drawing related Events
+ // Here we try to process all the drawing related Tasks not yet done
+ g_pVideoDriver->pollDrawingTasks();
// Pass all the surfaces to one
g_pVideoDriver->collectSurfaces();
@@ -134,7 +134,8 @@ void CGame::run()
g_pVideoDriver->updateScreen();
}
-
+
+ g_pVideoDriver->clearDrawingTasks();
// delay time remaining in current loop
g_pTimer->TimeToDelay();
diff --git a/src/common/CHUD.cpp b/src/common/CHUD.cpp
index 312834b..5182256 100644
--- a/src/common/CHUD.cpp
+++ b/src/common/CHUD.cpp
@@ -157,12 +157,10 @@ void CHUD::renderGalaxy()
lives = (m_lives<99) ? m_lives : 99;
charges = (m_charges<99) ? m_charges : 99;
- SDL_Surface *blitsurface = g_pVideoDriver->getBlitSurface();
-
// Draw the background
CSprite &HUDBox = g_pGfxEngine->getSprite(129);
- HUDBox.drawSprite(blitsurface, m_Rect.x, m_Rect.y);
+ HUDBox.drawSprite( m_Rect.x, m_Rect.y);
SDL_Surface* blitsfc = g_pVideoDriver->getBlitSurface();
g_pGfxEngine->drawDigits(getRightAlignedString(itoa(score),9), m_Rect.x+8, m_Rect.y+4, blitsfc );
diff --git a/src/common/CObject.cpp b/src/common/CObject.cpp
index 04edce5..b9e3496 100644
--- a/src/common/CObject.cpp
+++ b/src/common/CObject.cpp
@@ -632,21 +632,10 @@ void CObject::draw()
m_blinktime--;
}
else
- Sprite.drawSprite( sfc, showX, showY, (255-transluceny) );
+ {
+ Sprite.drawSprite( showX, showY, (255-transluceny) );
+ }
hasbeenonscreen = true;
-
- #ifdef DEBUG_COLLISION
- // In this special section we draw the colision rectangle to do further checks. Only in this special Debug mode.
- SDL_Rect col_rect;
-
- col_rect.x = showX + (m_BBox.x1>>STC);
- col_rect.y = showY + (m_BBox.y1>>STC);
- col_rect.w = (m_BBox.x2-m_BBox.x1)>>STC;
- col_rect.h = (m_BBox.y2-m_BBox.y1)>>STC;
-
- SDL_FillRect(sfc, &col_rect, 0xFFFF0000);
- #endif
-
}
}
diff --git a/src/common/CStatusScreen.cpp b/src/common/CStatusScreen.cpp
index 0b297e9..1a2810e 100644
--- a/src/common/CStatusScreen.cpp
+++ b/src/common/CStatusScreen.cpp
@@ -204,7 +204,7 @@ void CStatusScreen::createInventorySfcEp1()
for(j=0;j<i;j++)
{
CSprite &Sprite = g_pGfxEngine->getSprite(m_baseframe);
- Sprite.drawSprite( p_surface, x, (0+4)<<3);
+ Sprite._drawSprite( p_surface, x, (0+4)<<3);
x += Sprite.getWidth();
}
@@ -314,7 +314,7 @@ void CStatusScreen::createInventorySfcEp2()
for(j=0;j<i;j++)
{
CSprite &Sprite = g_pGfxEngine->getSprite(m_baseframe);
- Sprite.drawSprite( p_surface, x, (0+4)<<3 );
+ Sprite._drawSprite( p_surface, x, (0+4)<<3 );
x += Sprite.getWidth();
}
@@ -441,7 +441,7 @@ void CStatusScreen::createInventorySfcEp3()
for(j=0;j<i;j++)
{
CSprite &Sprite = g_pGfxEngine->getSprite(m_baseframe);
- Sprite.drawSprite( p_surface, x, (0+4)<<3);
+ Sprite._drawSprite( p_surface, x, (0+4)<<3);
x += Sprite.getWidth();
}
diff --git a/src/engine/CEvent.h b/src/engine/CEvent.h
index e40e928..e60c370 100644
--- a/src/engine/CEvent.h
+++ b/src/engine/CEvent.h
@@ -16,13 +16,14 @@
#include <string>
#include <list>
#include "common/direction.h"
-//#include "common/CObject.h"
#include "SmartPointer.h"
#include "CVec.h"
class CObject;
+// TODO: These Event Interfaces must go to another file. Those are Inlevel Galaxy Events
+
struct CEvent { virtual ~CEvent() {} };
struct EventEnterLevel : CEvent {
diff --git a/src/engine/CEventContainer.h b/src/engine/CEventContainer.h
index 05b3197..b8c8f8a 100644
--- a/src/engine/CEventContainer.h
+++ b/src/engine/CEventContainer.h
@@ -18,6 +18,7 @@
class CEventContainer {
public:
bool empty() { return m_EventList.empty(); }
+ void clear() { m_EventList.clear(); }
void add(const SmartPointer<CEvent>& ev) { m_EventList.push_back(ev); }
template<typename T> T* occurredEvent();
void pop_Event() { m_EventList.pop_front(); }
diff --git a/src/engine/vorticon/playgame/CPlayGameVorticon.cpp b/src/engine/vorticon/playgame/CPlayGameVorticon.cpp
index 05df5a9..5f68fdb 100644
--- a/src/engine/vorticon/playgame/CPlayGameVorticon.cpp
+++ b/src/engine/vorticon/playgame/CPlayGameVorticon.cpp
@@ -563,8 +563,6 @@ void CPlayGameVorticon::drawObjects()
{
if(m_hideobjects) return;
- SDL_Rect gameres = g_pVideoDriver->getGameResolution();
-
std::vector<CObject*>::iterator it_obj = m_Object.begin();
for(; it_obj!=m_Object.end() ; it_obj++)
{
diff --git a/src/engine/vorticon/playgame/CPlayGameWorldMap.cpp b/src/engine/vorticon/playgame/CPlayGameWorldMap.cpp
index 2b7950e..1dffae9 100644
--- a/src/engine/vorticon/playgame/CPlayGameWorldMap.cpp
+++ b/src/engine/vorticon/playgame/CPlayGameWorldMap.cpp
@@ -201,7 +201,7 @@ void CPlayGameVorticon::showKeensLeft()
x = 12;
for(i=0;i<m_Player[p].inventory.lives&&i<=10;i++)
{
- g_pGfxEngine->getSprite(m_Player[p].playerbaseframe+PMAPDOWNFRAME).drawSprite(boxsurface, x, y );
+ g_pGfxEngine->getSprite(m_Player[p].playerbaseframe+PMAPDOWNFRAME)._drawSprite(boxsurface, x, y );
x+=16;
}
y += 16;
diff --git a/src/graphics/CSprite.cpp b/src/graphics/CSprite.cpp
index c2531bc..d65a752 100644
--- a/src/graphics/CSprite.cpp
+++ b/src/graphics/CSprite.cpp
@@ -297,7 +297,18 @@ void blitMaskedSprite(SDL_Surface *dst, SDL_Surface *src, Uint32 color)
* \param x X-Coordinate, indicating the position on dst
* \param y Y-Coordinate, indicating the position on dst
*/
-void CSprite::drawSprite( SDL_Surface *dst, const Uint16 x, const Uint16 y, const Uint8 alpha )
+void CSprite::drawSprite( const Uint16 x, const Uint16 y, const Uint8 alpha )
+{
+ g_pVideoDriver->mDrawTasks.add( new DrawSpriteTask( this, x, y, alpha ) );
+}
+
+/**
+ * \brief The function that blits the sprite to dst (Low-Level)
+ * \param SDL_Surface Surface where the sprite will be drawn
+ * \param x X-Coordinate, indicating the position on dst
+ * \param y Y-Coordinate, indicating the position on dst
+ */
+void CSprite::_drawSprite( SDL_Surface *dst, const Uint16 x, const Uint16 y, const Uint8 alpha )
{
SDL_Rect dst_rect, src_rect;
dst_rect.x = x; dst_rect.y = y;
diff --git a/src/graphics/CSprite.h b/src/graphics/CSprite.h
index 66bed31..57a993b 100644
--- a/src/graphics/CSprite.h
+++ b/src/graphics/CSprite.h
@@ -33,7 +33,8 @@ public:
SDL_Surface *getSDLSurface() { return m_surface; }
SDL_Surface *getSDLMaskSurface() { return m_masksurface; }
- void drawSprite( SDL_Surface *dst, const Uint16 x, const Uint16 y, const Uint8 alpha=255 );
+ void drawSprite( const Uint16 x, const Uint16 y, const Uint8 alpha=255 );
+ void _drawSprite( SDL_Surface *dst, const Uint16 x, const Uint16 y, const Uint8 alpha=255 );
void drawBlinkingSprite( SDL_Surface *dst, Uint16 x, Uint16 y );
Uint16 getXOffset() { return m_xoffset; }
diff --git a/src/sdl/CVideoDriver.cpp b/src/sdl/CVideoDriver.cpp
index 8ae6a03..d1e395d 100644
--- a/src/sdl/CVideoDriver.cpp
+++ b/src/sdl/CVideoDriver.cpp
@@ -424,6 +424,49 @@ void CVideoDriver::stop()
mp_VideoEngine = NULL;
}
+
+////
+//// Drawing stuff related Stuff
+////
+
+
+void CVideoDriver::pollDrawingTasks()
+{
+ while(!mDrawTasks.empty())
+ {
+ if( DrawSpriteTask *drawSpriteTask = mDrawTasks.occurredEvent<DrawSpriteTask>() )
+ {
+ CSprite *Sprite = drawSpriteTask->mSpritePtr;
+
+ Sprite->_drawSprite(getBlitSurface(),
+ drawSpriteTask->mx,
+ drawSpriteTask->my,
+ drawSpriteTask->mAlpha);
+
+ }
+ else
+ {
+ g_pLogFile->textOut("Warning: Unknown Drawing task. Please let the developers debug this!");
+ }
+
+ mDrawTasks.pop_Event();
+ }
+}
+
+
+void CVideoDriver::clearDrawingTasks()
+{
+ if(!mDrawTasks.empty())
+ {
+ mDrawTasks.clear();
+ }
+}
+
+
+
+
+
+
CVideoDriver::~CVideoDriver()
{
stop();
diff --git a/src/sdl/CVideoDriver.h b/src/sdl/CVideoDriver.h
index a25fb2f..58a07a6 100644
--- a/src/sdl/CVideoDriver.h
+++ b/src/sdl/CVideoDriver.h
@@ -15,6 +15,8 @@
#include "CSingleton.h"
#include "CVidConfig.h"
#include "video/CVideoEngine.h"
+#include "video/DrawEvents.h"
+#include "engine/CEventContainer.h"
#ifdef USE_OPENGL
#include "sdl/video/COpenGL.h"
@@ -51,6 +53,10 @@ public:
void DeleteConsoleMsgs(void);
void AddConsoleMsg(const char *the_msg);
+ // Drawing related stuff
+
+ void pollDrawingTasks();
+ void clearDrawingTasks();
/**
* \description This function saves the given camera bounds. It is usually called
@@ -121,6 +127,8 @@ public:
CVideoEngine *mp_VideoEngine;
+ CEventContainer mDrawTasks;
+
std::list<CRect> m_Resolutionlist;
std::list<CRect> :: iterator m_Resolution_pos;
diff --git a/src/sdl/video/CVideoEngine.cpp b/src/sdl/video/CVideoEngine.cpp
index 4ba467b..93ffba3 100644
--- a/src/sdl/video/CVideoEngine.cpp
+++ b/src/sdl/video/CVideoEngine.cpp
@@ -5,6 +5,7 @@
* Author: gerhard
*/
+#include "sdl/CTimer.h"
#include "CVideoEngine.h"
#include "CLogFile.h"
diff --git a/src/sdl/video/CVideoEngine.h b/src/sdl/video/CVideoEngine.h
index 477a7b4..74bf471 100644
--- a/src/sdl/video/CVideoEngine.h
+++ b/src/sdl/video/CVideoEngine.h
@@ -18,7 +18,8 @@
#include "sdl/CVidConfig.h"
-class CVideoEngine {
+class CVideoEngine
+{
public:
CVideoEngine(const CVidConfig& VidConfig, Sint16 *&p_sbufferx, Sint16 *&p_sbuffery);
hooks/post-receive
--
clonekeenplus
|
|
From: Gerstrong <ger...@us...> - 2011-10-29 11:38:42
|
via 4c6fd3862a0c40e8e47d062ace864901a804f72c (commit)
from 8918e2346e2e96fe821f0ef75d089f69078e3b9c (commit)
- Log -----------------------------------------------------------------
commit 4c6fd3862a0c40e8e47d062ace864901a804f72c
Author: Gerhard Stein <ger...@gm...>
Date: Sat Oct 29 13:43:45 2011 +0200
Small speed improvements
-----------------------------------------------------------------------
Summary of changes:
src/CGame.cpp | 2 ++
src/CResourceLoader.cpp | 6 +++---
src/sdl/CVidConfig.h | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/CGame.cpp b/src/CGame.cpp
index 63a84ca..a5d3ce8 100644
--- a/src/CGame.cpp
+++ b/src/CGame.cpp
@@ -119,6 +119,8 @@ void CGame::run()
if (g_pTimer->TimeToRender())
{
+ // TODO: Here we try to process all the drawing related Events
+
// Pass all the surfaces to one
g_pVideoDriver->collectSurfaces();
diff --git a/src/CResourceLoader.cpp b/src/CResourceLoader.cpp
index 57b15ca..d934daa 100644
--- a/src/CResourceLoader.cpp
+++ b/src/CResourceLoader.cpp
@@ -49,8 +49,6 @@ int CResourceLoader::RunLoadAction(Action* act, const std::string &threadname, i
bool CResourceLoader::process(int* ret)
{
- SDL_FillRect(g_pVideoDriver->getBlitSurface(), NULL, 0x0);
-
if(!mp_Thread)
return false;
@@ -60,7 +58,9 @@ bool CResourceLoader::process(int* ret)
g_pTimer->TimeToLogic();
// Render the Screen
- if (g_pTimer->TimeToRender()) {
+ if (g_pTimer->TimeToRender())
+ {
+ SDL_FillRect(g_pVideoDriver->getBlitSurface(), NULL, 0x0);
renderLoadingGraphic();
setPermilage(m_permil+1);
g_pVideoDriver->updateScreen();
diff --git a/src/sdl/CVidConfig.h b/src/sdl/CVidConfig.h
index 865f6a4..1ae154d 100644
--- a/src/sdl/CVidConfig.h
+++ b/src/sdl/CVidConfig.h
@@ -17,7 +17,7 @@
#include <SDL_opengl.h>
#endif
-#include "Geometry.h"
+#include "utils/Geometry.h"
struct st_camera_bounds
{
hooks/post-receive
--
clonekeenplus
|
|
From: Gerstrong <ger...@us...> - 2011-10-29 11:28:25
|
via 8918e2346e2e96fe821f0ef75d089f69078e3b9c (commit)
via a8b1b388e3411eefc9834b26bf799a71d3a44cd8 (commit)
via 8efa1792299a444bf560b75e864ebd95848a519d (commit)
via 84538c40c3de8f3f62e8b5acb949ef8d4a1e9eb2 (commit)
via e43e111335c9bb9214fd41a5d3bdb00cd83349a5 (commit)
via 3ab67718cf6b6605e1d4d0b7de02e91bd805203f (commit)
via 234ebf4db048980fb9a3657d2e00472e8ef818db (commit)
via a5c90315562a2669537fbb2569aa3adba8902c56 (commit)
via b368825cde4bcb5c7ef7e884fec2fc0bd1a3554e (commit)
via 6bafc54f2d6bd9b2b51fe27a19b81e7c5d52d066 (commit)
via edefb3a282de3fe798b44a3ce2dc3b474c0bc503 (commit)
via 5d6d618cf34e9ee0dd2c6b9ccbbfbde6f6ca140a (commit)
via 8a67a9c89f3622dbf9e1efb9129d92446074412b (commit)
via bf83a95a8d663d66dfa79fd1080670a4fb47f1b3 (commit)
via fdbba585119391936aa281356b7241dba4bdb07b (commit)
via ec5b282b84b4617a2387d3dd33f1614af8339c83 (commit)
via 45ae2f3a61cda28a7bd5bf5402890160ae1c0ce8 (commit)
via 138133643b6c69c925be3645cc9262ddbbb016b6 (commit)
via 6cd20ce012b2a158928237e5c7d866ffe290f64c (commit)
via da8e0c7c75db84cd7a0514f3e72c419c8171920f (commit)
from 4afc8e28a1c8d820dc04a2f1569e3d11ad42dfb2 (commit)
- Log -----------------------------------------------------------------
commit 8918e2346e2e96fe821f0ef75d089f69078e3b9c
Author: Gerhard Stein <ger...@gm...>
Date: Sat Oct 29 13:09:27 2011 +0200
Preparations for a new Branch
commit a8b1b388e3411eefc9834b26bf799a71d3a44cd8
Author: Gerhard Stein <ger...@gm...>
Date: Sat Oct 29 12:46:53 2011 +0200
8-Bit Sounds in Galaxy fixed!
commit 8efa1792299a444bf560b75e864ebd95848a519d
Author: Gerhard Stein <ger...@gm...>
Date: Sun Oct 23 22:24:06 2011 +0200
OpenGL resizal now possible
commit 84538c40c3de8f3f62e8b5acb949ef8d4a1e9eb2
Author: Gerhard Stein <ger...@gm...>
Date: Tue Oct 11 18:52:07 2011 +0200
Video Bug fixes (Pointers)
commit e43e111335c9bb9214fd41a5d3bdb00cd83349a5
Author: Gerhard Stein <ger...@gm...>
Date: Tue Oct 11 18:34:08 2011 +0200
Cleanups
commit 3ab67718cf6b6605e1d4d0b7de02e91bd805203f
Author: Gerhard Stein <ger...@gm...>
Date: Tue Oct 11 18:17:33 2011 +0200
CSettings is now a Singleton class.
commit 234ebf4db048980fb9a3657d2e00472e8ef818db
Author: Gerhard Stein <gerstrong@gerstrong-desktop>
Date: Tue Oct 11 18:08:15 2011 +0200
Moved CSettings.* and adapted its class
commit a5c90315562a2669537fbb2569aa3adba8902c56
Author: Gerstrong <ger...@gm...>
Date: Tue Oct 4 17:52:05 2011 +0200
removed the Foreground Surface. It's not needed anymore and will spare trouble
commit b368825cde4bcb5c7ef7e884fec2fc0bd1a3554e
Author: Gerstrong <ger...@gm...>
Date: Mon Oct 3 21:09:37 2011 +0200
FGLayer removed from some code. This surface will be removed for better performance.
commit 6bafc54f2d6bd9b2b51fe27a19b81e7c5d52d066
Author: Gerstrong <ger...@gm...>
Date: Mon Oct 3 20:34:16 2011 +0200
Removed FGLayerSurface from CIntro
commit edefb3a282de3fe798b44a3ce2dc3b474c0bc503
Author: Gerstrong <ger...@gm...>
Date: Mon Oct 3 20:01:15 2011 +0200
Small cleanups
commit 5d6d618cf34e9ee0dd2c6b9ccbbfbde6f6ca140a
Author: Gerstrong <ger...@gm...>
Date: Sun Oct 2 16:02:28 2011 +0200
Cleanups
commit 8a67a9c89f3622dbf9e1efb9129d92446074412b
Author: Gerstrong <ger...@gm...>
Date: Sun Oct 2 15:42:55 2011 +0200
OpenGL fixes
commit bf83a95a8d663d66dfa79fd1080670a4fb47f1b3
Author: Gerstrong <ger...@gm...>
Date: Sun Oct 2 13:29:00 2011 +0200
Scaler is now a class and less calculations for scaling
commit fdbba585119391936aa281356b7241dba4bdb07b
Author: Gerstrong <ger...@gm...>
Date: Sat Oct 1 15:58:10 2011 +0200
Scaler declared as class, which later will be an object of CVideoEngine
commit ec5b282b84b4617a2387d3dd33f1614af8339c83
Author: Gerstrong <ger...@gm...>
Date: Sat Oct 1 15:26:08 2011 +0200
Improved Scaler Code
commit 45ae2f3a61cda28a7bd5bf5402890160ae1c0ce8
Author: Gerstrong <ger...@gm...>
Date: Sat Oct 1 14:02:49 2011 +0200
cleanups
commit 138133643b6c69c925be3645cc9262ddbbb016b6
Author: Gerstrong <ger...@gm...>
Date: Fri Sep 30 20:56:52 2011 +0200
scaler much more flexible and is adapted to the resizing mode.
commit 6cd20ce012b2a158928237e5c7d866ffe290f64c
Author: Gerstrong <ger...@gm...>
Date: Wed Sep 28 19:58:30 2011 +0200
tighter code and now resizable works togehter with filtered (scaleX) screens
commit da8e0c7c75db84cd7a0514f3e72c419c8171920f
Author: Gerstrong <ger...@gm...>
Date: Tue Sep 27 19:15:06 2011 +0200
App is now resizable when in Window mode
-----------------------------------------------------------------------
Summary of changes:
.cproject | 648 +-------------------
src/CGame.cpp | 48 +-
src/CGame.h | 2 -
src/FindFile.cpp | 46 +-
src/common/CAudioResources.cpp | 8 +-
src/common/CBehaviorEngine.h | 3 +
src/{sdl => common}/CSettings.cpp | 19 +-
src/{sdl => common}/CSettings.h | 8 +-
src/common/CStatusScreen.cpp | 7 +-
src/common/Menu/CAudioSettings.cpp | 5 +-
src/common/Menu/CControlsettings.cpp | 1 -
src/common/Menu/COptions.cpp | 7 +-
src/common/Menu/CProfilesMenu.cpp | 12 +-
src/common/Menu/CVideoSettings.cpp | 8 +-
src/core/CGameControl.cpp | 2 +-
src/dialog/CDialog.cpp | 10 +-
src/dialog/CDialog.h | 3 +-
src/dialog/CTextBox.cpp | 10 +-
src/engine/CEGAGraphics.cpp | 17 +-
src/engine/CEGAGraphics.h | 1 -
src/engine/CIntro.cpp | 8 +-
src/engine/CIntro.h | 2 +-
src/engine/CPassive.h | 1 -
src/engine/galaxy/CAudioGalaxy.cpp | 6 +-
.../galaxy/dialog/CMessageBoxBitmapGalaxy.cpp | 2 +-
src/engine/galaxy/dialog/CMessageBoxGalaxy.cpp | 2 +-
src/engine/galaxy/dialog/CMessageBoxSelection.cpp | 2 +-
src/engine/infoscenes/CAbout.cpp | 6 +-
src/engine/infoscenes/CCredits.cpp | 2 +-
src/engine/infoscenes/CHelp.cpp | 2 +-
src/engine/infoscenes/CHighScores.cpp | 4 +-
src/engine/infoscenes/COrderingInfo.cpp | 2 +-
src/engine/infoscenes/CPreviews.cpp | 2 +-
src/engine/infoscenes/CStory.cpp | 2 +-
src/engine/vorticon/CMenuVorticon.cpp | 1 -
src/engine/vorticon/CPassiveVort.cpp | 12 +-
src/engine/vorticon/CPassiveVort.h | 1 +
src/engine/vorticon/dialog/CMessageBoxVort.cpp | 5 +-
src/engine/vorticon/finale/CFinale.cpp | 2 +-
.../vorticon/playgame/CPlayGameGameState.cpp | 3 -
src/engine/vorticon/playgame/CPlayGameVorticon.cpp | 22 +-
src/engine/vorticon/playgame/CPlayGameWorldMap.cpp | 9 +-
src/graphics/CFont.cpp | 5 +-
src/hardware/dbopl.cpp | 5 +-
src/scale2x/getopt.cpp | 113 ----
src/scale2x/pixel.cpp | 68 --
src/scale2x/pixel.h | 30 -
src/scale2x/portable.h | 46 --
src/sdl/CInput.cpp | 19 +-
src/sdl/CVidConfig.h | 24 +-
src/sdl/CVideoDriver.cpp | 17 +-
src/sdl/video/COpenGL.cpp | 143 +++--
src/sdl/video/COpenGL.h | 6 +-
src/sdl/video/CSDLVideo.cpp | 157 ++----
src/sdl/video/CSDLVideo.h | 10 +-
src/sdl/video/CVideoEngine.cpp | 141 +----
src/sdl/video/CVideoEngine.h | 17 +-
src/sdl/video/scalers/CScaler.cpp | 111 ++++
src/sdl/video/scalers/CScaler.h | 55 ++
src/{scale2x => sdl/video/scalers}/scale2x.cpp | 0
src/{scale2x => sdl/video/scalers}/scale2x.h | 0
src/{scale2x => sdl/video/scalers}/scale3x.cpp | 0
src/{scale2x => sdl/video/scalers}/scale3x.h | 0
src/{scale2x => sdl/video/scalers}/scalebit.cpp | 20 +-
src/{scale2x => sdl/video/scalers}/scalebit.h | 0
src/utils/Geometry.h | 37 ++
66 files changed, 576 insertions(+), 1411 deletions(-)
rename src/{sdl => common}/CSettings.cpp (97%)
rename src/{sdl => common}/CSettings.h (81%)
delete mode 100644 src/scale2x/getopt.cpp
delete mode 100644 src/scale2x/pixel.cpp
delete mode 100644 src/scale2x/pixel.h
delete mode 100644 src/scale2x/portable.h
create mode 100644 src/sdl/video/scalers/CScaler.cpp
create mode 100644 src/sdl/video/scalers/CScaler.h
rename src/{scale2x => sdl/video/scalers}/scale2x.cpp (100%)
rename src/{scale2x => sdl/video/scalers}/scale2x.h (100%)
rename src/{scale2x => sdl/video/scalers}/scale3x.cpp (100%)
rename src/{scale2x => sdl/video/scalers}/scale3x.h (100%)
rename src/{scale2x => sdl/video/scalers}/scalebit.cpp (98%)
rename src/{scale2x => sdl/video/scalers}/scalebit.h (100%)
create mode 100644 src/utils/Geometry.h
diff --git a/.cproject b/.cproject
index 4bc485b..a4d0162 100644
--- a/.cproject
+++ b/.cproject
@@ -63,7 +63,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
- <entry excluding="tools|src/engine/vorticon/ai/yorp.cpp|src/engine/vorticon/ai/autoray.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+ <entry excluding="tools|src/engine/vorticon/ai/autoray.cpp|src/engine/vorticon/ai/yorp.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
@@ -86,7 +86,6 @@
<path value=""/>
</doc-comment-owner>
</storageModule>
- <storageModule moduleId="scannerConfiguration"/>
</cconfiguration>
<cconfiguration id="cdt.managedbuild.config.gnu.cross.exe.release.1352187457">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.cross.exe.release.1352187457" moduleId="org.eclipse.cdt.core.settings" name="Linux64">
@@ -171,7 +170,6 @@
<path value=""/>
</doc-comment-owner>
</storageModule>
- <storageModule moduleId="scannerConfiguration"/>
</cconfiguration>
<cconfiguration id="cdt.managedbuild.config.gnu.cross.exe.release.1352187457.1419947399">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.cross.exe.release.1352187457.1419947399" moduleId="org.eclipse.cdt.core.settings" name="Linux32">
@@ -259,7 +257,6 @@
<path value=""/>
</doc-comment-owner>
</storageModule>
- <storageModule moduleId="scannerConfiguration"/>
</cconfiguration>
<cconfiguration id="cdt.managedbuild.config.gnu.cross.exe.release.1352187457.565663007">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.cross.exe.release.1352187457.565663007" moduleId="org.eclipse.cdt.core.settings" name="Win32">
@@ -349,25 +346,16 @@
<path value=""/>
</doc-comment-owner>
</storageModule>
- <storageModule moduleId="scannerConfiguration"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="CommanderGenius.cdt.managedbuild.target.gnu.cross.exe.1037347008" name="Executable"/>
</storageModule>
- <storageModule moduleId="refreshScope"/>
+ <storageModule moduleId="refreshScope" versionNumber="1">
+ <resource resourceType="PROJECT" workspacePath="/clonekeenplus"/>
+ </storageModule>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
- <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
@@ -378,98 +366,8 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="false" filePath=""/>
- <parser enabled="false"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="false" filePath=""/>
- <parser enabled="false"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlC" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.debug.628712671;cdt.managedbuild.config.gnu.cross.exe.debug.628712671.;cdt.managedbuild.tool.gnu.c.compiler.base.958167318;cdt.managedbuild.tool.gnu.c.compiler.input.827316866">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
- <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
@@ -480,99 +378,9 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="false" filePath=""/>
- <parser enabled="false"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="false" filePath=""/>
- <parser enabled="false"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlC" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.debug.628712671;cdt.managedbuild.config.gnu.cross.exe.debug.628712671.;cdt.managedbuild.tool.gnu.cpp.compiler.base.1728576183;cdt.managedbuild.tool.gnu.cpp.compiler.input.2024816918">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
- <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
@@ -583,99 +391,9 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="false" filePath=""/>
- <parser enabled="false"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="false" filePath=""/>
- <parser enabled="false"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlC" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
</scannerConfigBuildInfo>
- <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.release.1352187457.1419947399;cdt.managedbuild.config.gnu.cross.exe.release.1352187457.1419947399.;cdt.managedbuild.tool.gnu.cpp.compiler.base.764956634;cdt.managedbuild.tool.gnu.cpp.compiler.input.1003856045">
- <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
- <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
+ <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.debug.628712671;cdt.managedbuild.config.gnu.cross.exe.debug.628712671.;cdt.managedbuild.tool.gnu.c.compiler.base.146745021;cdt.managedbuild.tool.gnu.c.compiler.input.712687651">
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
@@ -686,99 +404,9 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="false" filePath=""/>
- <parser enabled="false"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="false" filePath=""/>
- <parser enabled="false"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlC" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.release.1352187457.1419947399;cdt.managedbuild.config.gnu.cross.exe.release.1352187457.1419947399.;cdt.managedbuild.tool.gnu.c.compiler.base.1283247142;cdt.managedbuild.tool.gnu.c.compiler.input.1614439145">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
- <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
@@ -789,99 +417,9 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="false" filePath=""/>
- <parser enabled="false"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="false" filePath=""/>
- <parser enabled="false"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlC" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
</scannerConfigBuildInfo>
- <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.debug.628712671;cdt.managedbuild.config.gnu.cross.exe.debug.628712671.;cdt.managedbuild.tool.gnu.c.compiler.base.146745021;cdt.managedbuild.tool.gnu.c.compiler.input.712687651">
- <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
- <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
+ <scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.release.1352187457.1419947399;cdt.managedbuild.config.gnu.cross.exe.release.1352187457.1419947399.;cdt.managedbuild.tool.gnu.cpp.compiler.base.764956634;cdt.managedbuild.tool.gnu.cpp.compiler.input.1003856045">
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
@@ -892,99 +430,9 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="false" filePath=""/>
- <parser enabled="false"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="false" filePath=""/>
- <parser enabled="false"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlC" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.debug.628712671;cdt.managedbuild.config.gnu.cross.exe.debug.628712671.;cdt.managedbuild.tool.gnu.cpp.compiler.base.1880800842;cdt.managedbuild.tool.gnu.cpp.compiler.input.1330706771">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
- <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
@@ -995,86 +443,6 @@
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/${specs_file}"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'g++ -E -P -v -dD "${plugin_state_location}/specs.cpp"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
- <buildOutputProvider>
- <openAction enabled="true" filePath=""/>
- <parser enabled="true"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-c 'gcc -E -P -v -dD "${plugin_state_location}/specs.c"'" command="sh" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile">
- <buildOutputProvider>
- <openAction enabled="false" filePath=""/>
- <parser enabled="false"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlc" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
- <profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP">
- <buildOutputProvider>
- <openAction enabled="false" filePath=""/>
- <parser enabled="false"/>
- </buildOutputProvider>
- <scannerInfoProvider id="specsFile">
- <runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlC" useDefault="true"/>
- <parser enabled="true"/>
- </scannerInfoProvider>
- </profile>
</scannerConfigBuildInfo>
</storageModule>
</cproject>
diff --git a/src/CGame.cpp b/src/CGame.cpp
index 2a5f35a..63a84ca 100644
--- a/src/CGame.cpp
+++ b/src/CGame.cpp
@@ -18,6 +18,7 @@
#include "sdl/CInput.h"
#include "sdl/CTimer.h"
#include "sdl/sound/CSound.h"
+#include "common/CSettings.h"
CGame::CGame() :
m_firsttime(false),
@@ -41,18 +42,16 @@ m_Engine(m_firsttime)
*/
bool CGame::init(int argc, char *argv[])
{
- CSettings Settings;
-
// Check if there are settings on the PC, otherwise use defaults.
- if(!Settings.loadDrvCfg())
+ if(!g_pSettings->loadDrvCfg())
{
m_firsttime = true;
g_pLogFile->textOut(PURPLE,"First time message: CKP didn't find the driver config file. However, it generated some default values and will save them now.<br>");
- Settings.saveDrvCfg();
+ g_pSettings->saveDrvCfg();
}
- if(!Settings.loadGameCfg())
- Settings.loadDefaultGameCfg();
+ if(!g_pSettings->loadGameCfg())
+ g_pSettings->loadDefaultGameCfg();
// Setup the Hardware using the settings we have loaded
g_pLogFile->textOut(GREEN,"Loading hardware settings...<br>");
@@ -81,12 +80,10 @@ bool CGame::init(int argc, char *argv[])
// Load the driver needed to start the game
bool CGame::loadCKPDrivers()
{
- // initialize/activate all drivers
- g_pLogFile->ftextOut("Starting graphics driver...<br>");
-
- // The graphics are very important, if the other subsystems fail, warn but continue
+ // Init graphics
if (!g_pVideoDriver->start()) return false;
+ // Init the sound
g_pSound->init();
return true;
@@ -103,42 +100,45 @@ bool CGame::loadCKPDrivers()
*/
void CGame::run()
{
- CSettings Settings;
+
do
{
+
// Perform game logic
- if (g_pTimer->TimeToLogic()) {
+ if (g_pTimer->TimeToLogic())
+ {
// Poll Inputs
g_pInput->pollEvents();
- if (g_pInput->getHoldedKey(KF) &&
- g_pInput->getHoldedKey(KI) &&
- g_pInput->getHoldedKey(KX))
- {
- Settings.loadDefaultGraphicsCfg();
- Settings.saveDrvCfg();
- g_pVideoDriver->stop();
- g_pVideoDriver->start();
- }
- // Process Game Control
+ // Process Game Control
m_Engine.process();
}
+
// Render the Screen
- if (g_pTimer->TimeToRender()) {
+ if (g_pTimer->TimeToRender())
+ {
+
// Pass all the surfaces to one
g_pVideoDriver->collectSurfaces();
+
+
// Apply graphical effects if any
g_pGfxEngine->process();
+
+
// Now you really render the screen
// When enabled, it also will apply Filters
g_pVideoDriver->updateScreen();
+
}
+
// delay time remaining in current loop
g_pTimer->TimeToDelay();
- } while(!m_Engine.mustShutdown() && !g_pInput->getExitEvent());
+ } while(!m_Engine.mustShutdown() &&
+ !g_pInput->getExitEvent());
}
///////////////////////////////
diff --git a/src/CGame.h b/src/CGame.h
index 8e36aec..659d56a 100644
--- a/src/CGame.h
+++ b/src/CGame.h
@@ -9,7 +9,6 @@
#define CGAME_H_
#include "core/CGameControl.h"
-#include "sdl/CSettings.h"
class CGame {
public:
@@ -24,7 +23,6 @@ public:
private:
bool m_firsttime;
CGameControl m_Engine;
- CSettings Settings();
};
#endif /* CGAME_H_ */
diff --git a/src/FindFile.cpp b/src/FindFile.cpp
index 12e636f..23a1eea 100644
--- a/src/FindFile.cpp
+++ b/src/FindFile.cpp
@@ -28,7 +28,7 @@
#include "StringUtils.h"
#include "Debug.h"
#include "ConfigHandler.h"
-#include "sdl/CSettings.h"
+#include "common/CSettings.h"
#ifdef WIN32
# ifndef _WIN32_IE
@@ -71,33 +71,45 @@ using std::hash_set;
-void InitSearchPaths() {
+void InitSearchPaths()
+
+{
// have to set to find the config at some of the default places
InitBaseSearchPaths();
+
+
int i = 1;
- while(true) {
+ while(true)
+ {
+
std::string value;
- if(!ReadString(CONFIGFILENAME, "FileHandling", "SearchPath" + itoa(i), value, ""))
+ if(!ReadString(g_pSettings->getConfigFileName(), "FileHandling", "SearchPath" + itoa(i), value, ""))
break;
AddToFileList(&tSearchPaths, value);
i++;
+
}
// add the basesearchpaths to the searchpathlist as they should be saved in the end
- for(searchpathlist::const_iterator p1 = basesearchpaths.begin(); p1 != basesearchpaths.end(); i++,p1++) {
+ for(searchpathlist::const_iterator p1 = basesearchpaths.begin();
+ p1 != basesearchpaths.end(); i++,p1++)
+ {
AddToFileList(&tSearchPaths, *p1);
}
// print the searchpaths, this may be very usefull for the user
notes << "I have now the following searchpaths (in this order):\n";
- for(searchpathlist::const_iterator p2 = tSearchPaths.begin(); p2 != tSearchPaths.end(); p2++) {
+ for(searchpathlist::const_iterator p2 = tSearchPaths.begin();
+ p2 != tSearchPaths.end(); p2++)
+ {
std::string path = *p2;
ReplaceFileVariables(path);
notes << " " << path << "\n";
}
notes << " And that's all." << endl;
+
}
@@ -106,16 +118,22 @@ searchpathlist tSearchPaths;
-bool IsFileAvailable(const std::string& f, bool absolute) {
+bool IsFileAvailable(const std::string& f, bool absolute)
+{
std::string abs_f;
- if(absolute) {
+
+ if(absolute)
abs_f = f;
- } else
- if((abs_f = GetFullFileName(f)) == "") return false;
+ else
+ {
+ if((abs_f = GetFullFileName(f)) == "")
+ return false;
+ }
// remove trailing slashes
// don't remove them on WIN, if it is a drive-letter
- while(abs_f.size() > 0 && (abs_f[abs_f.size()-1] == '\\' || abs_f[abs_f.size()-1] == '/')) {
+ while(abs_f.size() > 0 && (abs_f[abs_f.size()-1] == '\\' || abs_f[abs_f.size()-1] == '/'))
+ {
#ifdef WIN32
if(abs_f.size() > 2 && abs_f[abs_f.size()-2] == ':') break;
#endif
@@ -140,14 +158,16 @@ bool IsFileAvailable(const std::string& f, bool absolute) {
//////////////////////
// Replaces backward slashes with forward slashes (windows only)
// Used when comparing two paths
-static void ReplaceSlashes(std::string& path) {
+static void ReplaceSlashes(std::string& path)
+{
#ifdef WIN32
for (std::string::iterator it = path.begin(); it != path.end(); it++)
if (*it == '\\') *it = '/';
#endif
}
-bool EqualPaths(const std::string& path1, const std::string& path2) {
+bool EqualPaths(const std::string& path1, const std::string& path2)
+{
std::string p1 = path1;
std::string p2 = path2;
diff --git a/src/common/CAudioResources.cpp b/src/common/CAudioResources.cpp
index a9b4184..aa118f9 100644
--- a/src/common/CAudioResources.cpp
+++ b/src/common/CAudioResources.cpp
@@ -32,7 +32,6 @@ bool CAudioResources::readISFintoWaveForm( CSoundSlot &soundslot, const byte *im
const byte *AL_Sounddata_start = imfdata_ptr;
const byte *AL_Sounddata_end = AL_Sounddata_start+data_size;
- //OPLEmulator.ALStopSound();
OPLEmulator.ShutAL();
Bit8u alBlock = ((AL_Sound.block & 7) << 2) | 0x20;
if (!(AL_Sound.inst.mSus | AL_Sound.inst.cSus))
@@ -62,9 +61,10 @@ bool CAudioResources::readISFintoWaveForm( CSoundSlot &soundslot, const byte *im
OPLEmulator.Chip__WriteReg( alFreqL, *AL_Sounddata_ptr );
OPLEmulator.Chip__WriteReg( alFreqH, alBlock );
}
- else OPLEmulator.Chip__WriteReg( alFreqH, 0 );
+ else
+ OPLEmulator.Chip__WriteReg( alFreqH, 0 );
- if(formatsize == 2)
+ if(formatsize == 2) // 16-Bit Sound
{
for( unsigned int count=0 ; count<waittimes ; count++ )
{
@@ -82,7 +82,7 @@ bool CAudioResources::readISFintoWaveForm( CSoundSlot &soundslot, const byte *im
waveform_ptr += samplesPerMusicTick*m_AudioSpec.channels*formatsize;
}
}
- else
+ else // 8-Bit Sound
{
for( unsigned int count=0 ; count<waittimes ; count++ )
{
diff --git a/src/common/CBehaviorEngine.h b/src/common/CBehaviorEngine.h
index 9de169c..c878a30 100644
--- a/src/common/CBehaviorEngine.h
+++ b/src/common/CBehaviorEngine.h
@@ -68,6 +68,9 @@ public:
std::vector<stTeleporterTable>& getTeleporterTable()
{ return m_TeleporterTable; }
+ CEventContainer &EventList()
+ { return m_EventList; }
+
void setEpisode(size_t Episode);
CEventContainer m_EventList;
diff --git a/src/sdl/CSettings.cpp b/src/common/CSettings.cpp
similarity index 97%
rename from src/sdl/CSettings.cpp
rename to src/common/CSettings.cpp
index ca07137..bee4b31 100644
--- a/src/sdl/CSettings.cpp
+++ b/src/common/CSettings.cpp
@@ -5,16 +5,17 @@
* Author: gerstrong
*/
-#include "common/options.h"
-#include "common/CBehaviorEngine.h"
-#include "fileio/CConfiguration.h"
#include "CLogFile.h"
#include "FindFile.h"
#include "ConfigHandler.h"
#include "CSettings.h"
-#include "CVideoDriver.h"
-#include "CTimer.h"
-#include "sound/CSound.h"
+#include "sdl/CTimer.h"
+#include "sdl/sound/CSound.h"
+#include "sdl/CVideoDriver.h"
+#include "common/options.h"
+#include "common/CBehaviorEngine.h"
+#include "fileio/CConfiguration.h"
+
/**
* \brief The CSettings class handles the saving and loading of all the settings that are saved in
@@ -22,7 +23,8 @@
*
* \param p_option pointer to an array that stores the options settings of the game
*/
-CSettings::CSettings() {
+CSettings::CSettings()
+{
notes << "Reading game options from " << GetFullFileName(CONFIGFILENAME) << endl;
notes << "Will write game options to " << GetWriteFullFileName(CONFIGFILENAME, true) << endl;
}
@@ -239,4 +241,7 @@ bool CSettings::saveGameCfg()
return true;
}
+const std::string CSettings::getConfigFileName() const
+{ return CONFIGFILENAME; }
+
CSettings::~CSettings() {}
diff --git a/src/sdl/CSettings.h b/src/common/CSettings.h
similarity index 81%
rename from src/sdl/CSettings.h
rename to src/common/CSettings.h
index e1bcb53..abfb690 100644
--- a/src/sdl/CSettings.h
+++ b/src/common/CSettings.h
@@ -13,7 +13,12 @@
#ifndef CSETTINGS_H_
#define CSETTINGS_H_
-class CSettings {
+#include "CSingleton.h"
+#define g_pSettings CSettings::Get()
+
+
+class CSettings : public CSingleton<CSettings>
+{
public:
// NOTE: If no option structure is passed, you must be no means use
// loadGameCfg(), saveGameCfg(), loadDefaultGameCfg(); setOption(..);
@@ -26,6 +31,7 @@ public:
bool saveGameCfg();
void loadDefaultGameCfg();
void setOption( e_OptionKeyword opt, const std::string &menuname, const std::string &name, char value);
+ const std::string getConfigFileName() const;
virtual ~CSettings();
};
diff --git a/src/common/CStatusScreen.cpp b/src/common/CStatusScreen.cpp
index 33f5565..0b297e9 100644
--- a/src/common/CStatusScreen.cpp
+++ b/src/common/CStatusScreen.cpp
@@ -54,14 +54,15 @@ void CStatusScreen::draw()
m_closed = true;
}
-
if(!m_closed)
- SDL_BlitSurface(mp_StatusSfc, NULL, g_pVideoDriver->mp_VideoEngine->getFGLayerSurface(), &m_StatusRect );
+ {
+ SDL_BlitSurface(mp_StatusSfc, NULL, g_pVideoDriver->mp_VideoEngine->getBlitSurface(), &m_StatusRect );
+ }
}
SDL_Surface* CStatusScreen::CreateStatusSfc()
{
- SDL_Surface *p_blitSurface = g_pVideoDriver->mp_VideoEngine->getFGLayerSurface();
+ SDL_Surface *p_blitSurface = g_pVideoDriver->mp_VideoEngine->getBlitSurface();
const Uint32 rmask = p_blitSurface->format->Rmask;
const Uint32 gmask = p_blitSurface->format->Gmask;
const Uint32 bmask = p_blitSurface->format->Bmask;
diff --git a/src/common/Menu/CAudioSettings.cpp b/src/common/Menu/CAudioSettings.cpp
index f09fb20..14ad22b 100644
--- a/src/common/Menu/CAudioSettings.cpp
+++ b/src/common/Menu/CAudioSettings.cpp
@@ -8,7 +8,7 @@
#include "CAudioSettings.h"
#include "sdl/CInput.h"
#include "sdl/CVideoDriver.h"
-#include "sdl/CSettings.h"
+#include "common/CSettings.h"
#include "sdl/sound/CSound.h"
#include "sdl/music/CMusic.h"
#include "StringUtils.h"
@@ -66,7 +66,6 @@ void CAudioSettings::processSpecific()
if( m_mustclose )
{
- CSettings Settings;
bool wasPlaying = g_pMusicPlayer->playing();
// Check if the music is playing, stop it and restart it, if necessary
@@ -84,7 +83,7 @@ void CAudioSettings::processSpecific()
g_pSound->setSoundBlasterMode(m_Soundblaster);
- Settings.saveDrvCfg();
+ g_pSettings->saveDrvCfg();
if(m_must_restart_sounddriver)
{
diff --git a/src/common/Menu/CControlsettings.cpp b/src/common/Menu/CControlsettings.cpp
index 6ff4778..62b003e 100644
--- a/src/common/Menu/CControlsettings.cpp
+++ b/src/common/Menu/CControlsettings.cpp
@@ -11,7 +11,6 @@
#include "common/CBehaviorEngine.h"
#include "sdl/CInput.h"
-#include "sdl/CSettings.h"
#include "sdl/CVideoDriver.h"
const std::string actionsnames[MAX_COMMANDS] =
diff --git a/src/common/Menu/COptions.cpp b/src/common/Menu/COptions.cpp
index cbe97c6..2305e12 100644
--- a/src/common/Menu/COptions.cpp
+++ b/src/common/Menu/COptions.cpp
@@ -8,7 +8,7 @@
#include "COptions.h"
#include "sdl/CInput.h"
#include "sdl/CVideoDriver.h"
-#include "sdl/CSettings.h"
+#include "common/CSettings.h"
COptions::COptions(Uint8 dlg_theme, stOption *p_option) :
CBaseMenu(dlg_theme),
@@ -33,10 +33,7 @@ void COptions::processSpecific()
std::string buf;
if(m_mustclose) // If menu is about to close save the options
- {
- CSettings Settings;
- Settings.saveGameCfg();
- }
+ g_pSettings->saveGameCfg();
if( m_selection != NO_SELECTION)
{
diff --git a/src/common/Menu/CProfilesMenu.cpp b/src/common/Menu/CProfilesMenu.cpp
index 272db99..bcfa428 100644
--- a/src/common/Menu/CProfilesMenu.cpp
+++ b/src/common/Menu/CProfilesMenu.cpp
@@ -7,7 +7,7 @@
#include "CProfilesMenu.h"
#include "common/Menu/CSelectionMenu.h"
-#include "sdl/CSettings.h"
+#include "common/CSettings.h"
#include "sdl/CVideoDriver.h"
#include "sdl/CTimer.h"
#include "common/CBehaviorEngine.h"
@@ -55,8 +55,7 @@ void CProfilesMenu::processSpecific()
void CProfilesMenu::setDefaultClassic()
{
stOption *p_option = g_pBehaviorEngine->m_option;
- CSettings Settings;
- Settings.loadDrvCfg();
+ g_pSettings->loadDrvCfg();
g_pVideoDriver->setSpecialFXMode(false);
st_camera_bounds &CameraBounds = g_pVideoDriver->...
[truncated message content] |
|
From: Gerstrong <ger...@us...> - 2011-10-29 11:05:37
|
via 4afc8e28a1c8d820dc04a2f1569e3d11ad42dfb2 (commit)
via 9126cbe7351316e8b66adfc2fcb31ee4aef63554 (commit)
via 1ca1bad7dadf9813cd0920267d468b6b8076f437 (commit)
from e885ef59d79ff2cc3bef690d37b96e55aeb557cf (commit)
- Log -----------------------------------------------------------------
commit 4afc8e28a1c8d820dc04a2f1569e3d11ad42dfb2
Author: Gerstrong <ger...@gm...>
Date: Tue Sep 27 18:36:12 2011 +0200
Cleanups of Names and resolution fixed to 320x200 in SDL-Mode
commit 9126cbe7351316e8b66adfc2fcb31ee4aef63554
Author: Gerstrong <ger...@gm...>
Date: Sun Sep 25 20:49:05 2011 +0200
Cleanups and resolution adaptations.
commit 1ca1bad7dadf9813cd0920267d468b6b8076f437
Author: Gerstrong <ger...@gm...>
Date: Sun Sep 25 19:41:55 2011 +0200
Another cleanup
-----------------------------------------------------------------------
Summary of changes:
src/ConfigHandler.h | 9 ++--
src/common/CPlayerLevel.cpp | 2 -
src/common/Menu/CVideoSettings.cpp | 22 +++++----
src/common/Menu/CVideoSettings.h | 4 +-
src/dialog/CDialog.cpp | 1 +
src/sdl/CSettings.cpp | 19 ++++----
src/sdl/CVidConfig.cpp | 21 ++++----
src/sdl/CVidConfig.h | 32 +++++++------
src/sdl/CVideoDriver.cpp | 91 ++++++++++++++++++-----------------
src/sdl/CVideoDriver.h | 12 ++--
src/sdl/resolutionlist.h | 4 +-
src/sdl/video/COpenGL.cpp | 35 ++++++--------
src/sdl/video/CSDLVideo.cpp | 54 +++++++++++----------
src/sdl/video/CVideoEngine.cpp | 31 ++++++------
src/sdl/video/CVideoEngine.h | 2 +-
15 files changed, 173 insertions(+), 166 deletions(-)
diff --git a/src/ConfigHandler.h b/src/ConfigHandler.h
index 8dc0091..b68f200 100644
--- a/src/ConfigHandler.h
+++ b/src/ConfigHandler.h
@@ -34,10 +34,11 @@
// Value reading
-bool ReadString(const std::string& filename, const std::string& section, const std::string& key, std::string& value, std::string defaultv, bool abs_fn = false);
-bool ReadInteger(const std::string& filename, const std::string& section, const std::string& key, int *value, int defaultv);
-bool ReadFloat(const std::string& filename, const std::string& section, const std::string& key, float *value, float defaultv);
-bool ReadIntArray(const std::string& filename, const std::string& section, const std::string& key, int *array, int num_items);
+bool ReadString(const std::string& filename, const std::string& section, const std::string& key, std::string& value, std::string defaultv, bool abs_fn = false);
+bool ReadInteger(const std::string& filename, const std::string& section, const std::string& key, int *value, int defaultv);
+inline bool ReadInteger(const std::string& filename, const std::string& section, const std::string& key, Uint16 *value, int defaultv);
+bool ReadFloat(const std::string& filename, const std::string& section, const std::string& key, float *value, float defaultv);
+bool ReadIntArray(const std::string& filename, const std::string& section, const std::string& key, int *array, int num_items);
struct Color;
diff --git a/src/common/CPlayerLevel.cpp b/src/common/CPlayerLevel.cpp
index 925bdb9..918371a 100644
--- a/src/common/CPlayerLevel.cpp
+++ b/src/common/CPlayerLevel.cpp
@@ -564,8 +564,6 @@ void CPlayer::JumpAndPogo()
{
if(!ppogostick)
{
- CPhysicsSettings &PhysicsSettings = g_pBehaviorEngine->getPhysicsSettings();
-
if (playcontrol[PA_X] < 0)
xinertia -= 3;
if (playcontrol[PA_X] > 0)
diff --git a/src/common/Menu/CVideoSettings.cpp b/src/common/Menu/CVideoSettings.cpp
index 3ccf528..5dd962c 100644
--- a/src/common/Menu/CVideoSettings.cpp
+++ b/src/common/Menu/CVideoSettings.cpp
@@ -39,9 +39,9 @@ mp_CameraSettings(NULL)
std::string buf;
mp_Dialog = new CDialog(29, 11, INPUT_MODE_OPTION, m_dlg_theme);
- st_resolution &Res = m_Vidconfig.m_Resolution;
+ CRect &Res = m_Vidconfig.m_DisplayRect;
- buf = "Resolution: " + itoa(Res.width) + "x" + itoa(Res.height) + "x" + itoa(Res.depth);
+ buf = "Resolution: " + itoa(Res.w) + "x" + itoa(Res.h) + "x" + itoa(32);
mp_Dialog->addObject(DLG_OBJ_OPTION_TEXT, 1, 1, buf);
buf = m_Vidconfig.Fullscreen ? "Fullscreen mode" : "Windowed mode";
@@ -128,17 +128,18 @@ void CVideoSettings::processSpecific(){
mp_Dialog->m_min = 1;
mp_Dialog->m_max = g_pVideoDriver->m_Resolutionlist.size();
- st_resolution &Res = m_Vidconfig.m_Resolution;
- buf = "Resolution: " + itoa(Res.width) + "x" + itoa(Res.height) + "x" + itoa(Res.depth);
+ CRect &Res = m_Vidconfig.m_DisplayRect;
+ buf = "Resolution: " + itoa(Res.w) + "x" + itoa(Res.h);
mp_Dialog->setObjectText(0,buf);
}
else if(m_current == 3)
{
#ifdef USE_OPENGL
- if(m_Vidconfig.m_opengl) {
+ if(m_Vidconfig.m_opengl)
+ {
mp_Dialog->m_min = 1;
- mp_Dialog->m_max = 1;
+ mp_Dialog->m_max = 2;
buf = "GL Filter: ";
buf += (m_Vidconfig.m_opengl_filter==1) ? "Linear" : "Nearest";
}
@@ -194,7 +195,7 @@ void CVideoSettings::processSpecific(){
m_Resolution_pos = m_Resolutionlist.begin();
int value = mp_Dialog->m_dlgobject.at(0)->m_Option->m_value;
for( ; value>0 ; value-- ) m_Resolution_pos++;
- m_Vidconfig.m_Resolution = *m_Resolution_pos;
+ m_Vidconfig.m_DisplayRect = *m_Resolution_pos;
}
else if(m_selection == 1)
{
@@ -214,11 +215,11 @@ void CVideoSettings::processSpecific(){
#ifdef USE_OPENGL
- if(m_Vidconfig.m_opengl) {
+ if(m_Vidconfig.m_opengl)
+ {
buf = "GL Filter: ";
buf += (m_Vidconfig.m_opengl_filter==1) ? "Linear" : "Nearest";
mp_Dialog->setObjectType(3, DLG_OBJ_OPTION_TEXT);
-
}
else
#endif
@@ -233,7 +234,8 @@ void CVideoSettings::processSpecific(){
else if(m_selection == 3)
{
#ifdef USE_OPENGL
- if(m_Vidconfig.m_opengl) {
+ if(m_Vidconfig.m_opengl)
+ {
m_Vidconfig.m_opengl_filter = !m_Vidconfig.m_opengl_filter;
}
else
diff --git a/src/common/Menu/CVideoSettings.h b/src/common/Menu/CVideoSettings.h
index 807a1f0..d8ae4fd 100644
--- a/src/common/Menu/CVideoSettings.h
+++ b/src/common/Menu/CVideoSettings.h
@@ -23,8 +23,8 @@ public:
private:
CVidConfig m_Vidconfig;
- std::list<st_resolution> m_Resolutionlist;
- std::list<st_resolution>::iterator m_Resolution_pos;
+ std::list<CRect> m_Resolutionlist;
+ std::list<CRect>::iterator m_Resolution_pos;
int m_current; //used to show what is currently selected without actually changing the value
bool m_changed;
std::string m_usedSoftwareVideoDriver;
diff --git a/src/dialog/CDialog.cpp b/src/dialog/CDialog.cpp
index aa78db7..190f627 100644
--- a/src/dialog/CDialog.cpp
+++ b/src/dialog/CDialog.cpp
@@ -503,6 +503,7 @@ void CDialog::draw()
m_dlgobject[i]->setSelection( i==m_selected_ID ? true : false);
m_dlgobject[i]->render(dst_sfc, m_scroll, false );
}
+
Font.setFGColour(dst_sfc->format, 0x0); // Set black letter color for the other elements
if(m_inputmode == INPUT_MODE_COUNTER)
diff --git a/src/sdl/CSettings.cpp b/src/sdl/CSettings.cpp
index d652635..ca07137 100644
--- a/src/sdl/CSettings.cpp
+++ b/src/sdl/CSettings.cpp
@@ -43,12 +43,11 @@ bool CSettings::saveDrvCfg()
Configuration.WriteString("FileHandling", "SearchPath" + itoa(i), *p);
CVidConfig &VidConf = g_pVideoDriver->getVidConfig();
- Configuration.WriteInt("Video", "bpp",VidConf.m_Resolution.depth);
Configuration.SetKeyword("Video", "fullscreen", VidConf.Fullscreen);
Configuration.SetKeyword("Video", "OpenGL", VidConf.m_opengl);
- Configuration.WriteInt("Video", "width", VidConf.m_Resolution.width);
- Configuration.WriteInt("Video", "height", VidConf.m_Resolution.height);
+ Configuration.WriteInt("Video", "width", VidConf.m_DisplayRect.w);
+ Configuration.WriteInt("Video", "height", VidConf.m_DisplayRect.h);
Configuration.WriteInt("Video", "scale", VidConf.Zoom);
#ifdef USE_OPENGL
Configuration.WriteInt("Video", "OGLfilter", VidConf.m_opengl_filter);
@@ -90,18 +89,20 @@ bool CSettings::loadDrvCfg()
else
{
CVidConfig VidConf;
- st_resolution &res = VidConf.m_Resolution;
- Configuration.ReadInteger("Video", "bpp", &res.depth, 32);
- Configuration.ReadInteger("Video", "width", &res.width, 320);
- Configuration.ReadInteger("Video", "height", &res.height, 200);
+ CRect &res = VidConf.m_DisplayRect;
+ //Configuration.ReadInteger("Video", "bpp", &res.depth, 32);
+ int value = 0;
+ Configuration.ReadInteger("Video", "width", &value, 320);
+ res.w = value;
+ Configuration.ReadInteger("Video", "height", &value, 200);
+ res.h = value;
- if(res.depth*res.width*res.height <= 0)
+ if(res.w*res.h <= 0)
{
g_pLogFile->ftextOut(RED,"Error reading the configuration file!<br>");
return false;
}
- int value=0;
Configuration.ReadKeyword("Video", "fullscreen", &VidConf.Fullscreen, false);
#ifdef USE_OPENGL
Configuration.ReadInteger("Video", "OGLfilter", &VidConf.m_opengl_filter, false);
diff --git a/src/sdl/CVidConfig.cpp b/src/sdl/CVidConfig.cpp
index 546e925..292a356 100644
--- a/src/sdl/CVidConfig.cpp
+++ b/src/sdl/CVidConfig.cpp
@@ -37,11 +37,10 @@ void CVidConfig::reset()
#endif
Fullscreen=true;
#else
- m_Resolution.width=320;
- m_Resolution.height=200;
- m_Resolution.depth=32;
+ m_DisplayRect.w=320;
+ m_DisplayRect.h=200;
#if defined(ANDROID)
- m_Resolution.depth=16;
+ //m_Resolution.depth=16;
#endif
Fullscreen=false;
#endif
@@ -58,10 +57,10 @@ void CVidConfig::reset()
m_CameraBounds.reset();
m_special_fx = true;
- m_Gamescreen.x = 0;
- m_Gamescreen.y = 0;
- m_Gamescreen.w = 320;
- m_Gamescreen.h = 200;
+ m_GameRect.x = 0;
+ m_GameRect.y = 0;
+ m_GameRect.w = 320;
+ m_GameRect.h = 200;
#if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR)
m_opengl = true;
@@ -74,11 +73,11 @@ void CVidConfig::reset()
void CVidConfig::setResolution(const int width, const int height, const int depth)
{
- const st_resolution res(width, height, depth);
+ const CRect res(width, height);
setResolution(res);
}
-void CVidConfig::setResolution(const st_resolution& res)
+void CVidConfig::setResolution(const CRect& res)
{
- m_Resolution = res;
+ m_DisplayRect = res;
}
diff --git a/src/sdl/CVidConfig.h b/src/sdl/CVidConfig.h
index fc67526..3bab290 100644
--- a/src/sdl/CVidConfig.h
+++ b/src/sdl/CVidConfig.h
@@ -17,25 +17,27 @@
#include <SDL_opengl.h>
#endif
-struct st_resolution
+/**
+ * This structure defines the resolution composed of width height and depth
+ */
+struct CRect : public SDL_Rect
{
- int width,height,depth;
+ CRect( const Uint16 lwidth = 0, const Uint16 lheight = 0 )
+ { w=lwidth; w=lheight; };
- st_resolution(const int lwidth=0, const int lheight=0, const int ldepth=0) :
- width(lwidth), height(lheight), depth(ldepth) {};
+ CRect( const SDL_VideoInfo* InfoPtr )
+ { w=InfoPtr->current_w; h=InfoPtr->current_w; };
- bool operator==(const st_resolution target)
+ bool operator==( const CRect &target )
{
- return (target.depth == depth &&
- target.height == height &&
- target.width == width);
+ return (target.x == x && target.y == y &&
+ target.w == w && target.h == h);
}
- float computeAspectRatio() const
+ float aspectRatio() const
{
- return float(width)/float(height);
+ return (float(w)/float(h));
}
-
};
struct st_camera_bounds
@@ -60,10 +62,12 @@ public:
void reset();
void setResolution(const int width, const int height, const int depth);
- void setResolution(const st_resolution& res);
+ void setResolution(const CRect& res);
+
+ CRect m_GameRect; // Also called Screenspace.
+ CRect m_FilteredRect; // The resulting after filtering.
+ CRect m_DisplayRect; // The Fullscreen-Resolution or the Window Size
- st_resolution m_Resolution;
- SDL_Rect m_Gamescreen; // Also called Screenspace. Here the player will be able to choose a higher resolution for the gameplay.
bool Fullscreen;
short m_ScaleXFilter;
unsigned short Zoom;
diff --git a/src/sdl/CVideoDriver.cpp b/src/sdl/CVideoDriver.cpp
index c63ef72..4333254 100644
--- a/src/sdl/CVideoDriver.cpp
+++ b/src/sdl/CVideoDriver.cpp
@@ -36,6 +36,7 @@ typedef struct stConsoleMessage
{
char msg[80];
} stConsoleMessage;
+
stConsoleMessage cmsg[MAX_CONSOLE_MESSAGES];
int NumConsoleMessages = 0;
int ConsoleExpireTimer = 0;
@@ -50,7 +51,9 @@ mp_sbuffery(NULL)
resetSettings();
}
-void CVideoDriver::resetSettings() {
+// TODO: This should return something!
+void CVideoDriver::resetSettings()
+{
m_VidConfig.reset();
@@ -67,52 +70,55 @@ void CVideoDriver::resetSettings() {
// initResolutionList() reads the local list of available resolution.
// This function can only be called internally
+// TODO: This should return something!
void CVideoDriver::initResolutionList()
{
- st_resolution resolution;
+ // This call will get the resolution we have right now and set it up for the system
+ // On Handheld devices this means, they will only take that resolution and that would it be.
+ // On the PC, this is the current resolution but will add others.
+ CRect resolution(SDL_GetVideoInfo());
+
+ // We have a resolution list, clear it and create a new one.
+
m_Resolutionlist.clear();
+// TODO: Not sure if those defines are really needed anymore.
#if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR)
resolution.width = 320; // 320;
resolution.height = 200; // 480;
- resolution.depth = 32;
- m_Resolutionlist.clear();
- m_Resolutionlist.push_back(resolution);
#elif defined(ANDROID)
resolution.width = 320;
resolution.height = 200;
- resolution.depth = 16;
- m_Resolutionlist.clear();
+#endif
+
+ // The best retrieved resolution will be added to our resolution list.
m_Resolutionlist.push_back(resolution);
-#else
- char buf[256];
+ // Now on non-handheld devices let's check for more resolutions.
+#if !defined(TARGET_OS_IPHONE) && !defined(TARGET_IPHONE_SIMULATOR) && !defined(ANDROID)
for( unsigned int c=0 ; c<NUM_MAIN_RESOLUTIONS ; c++ )
{
- strcpy(buf, ResolutionsList[c]);
-
- if(sscanf(buf,"%ix%ix%i", &resolution.width, &resolution.height, &resolution.depth) >= 2)
+ // Depth won't be read anymore! Take the one the system is using actually
+ if(sscanf(ResolutionsList[c],"%ix%i", &resolution.w, &resolution.h) >= 2)
+ {
// Now check if it's possible to use this resolution
verifyResolution( resolution, SDL_FULLSCREEN );
+ }
}
+ // In case there is no fullscreen, we will adapt the resolution it's best to the window
if(!m_VidConfig.Fullscreen)
{
int e = 1;
- resolution.width = 320;
- resolution.height = 200;
-#if defined(WIZ)
- resolution.depth = 16;
-#else
- resolution.depth = 32;
-#endif
+ resolution.w = 320;
+ resolution.h = 200;
int maxwidth = SDL_GetVideoInfo()->current_w;
- while(resolution.width < maxwidth)
+ while(resolution.w < maxwidth)
{
- resolution.width = 320 * e;
- resolution.height = 200 * e;
+ resolution.w = 320 * e;
+ resolution.h = 200 * e;
// Now check if it's possible to use this resolution
verifyResolution( resolution, 0 );
@@ -121,23 +127,19 @@ void CVideoDriver::initResolutionList()
}
#endif
- if(m_Resolutionlist.empty()) {
- resolution.width = 320;
- resolution.height = 200;
- resolution.depth = 32;
- m_Resolutionlist.push_back(resolution);
+ if(m_Resolutionlist.empty())
+ {
+ g_pLogFile->ftextOut(RED, "Error! The resolution list is empty(). That cannot be! Exiting...\n");
}
m_Resolution_pos = m_Resolutionlist.begin();
}
-void CVideoDriver::verifyResolution( st_resolution& resolution, const int flags )
+void CVideoDriver::verifyResolution( CRect& resolution, const int flags )
{
- resolution.depth = SDL_VideoModeOK( resolution.width, resolution.height, resolution.depth, flags );
-
- if(resolution.depth)
+ if(SDL_VideoModeOK( resolution.w, resolution.h, 32, flags ))
{
- std::list<st_resolution> :: iterator i;
+ std::list<CRect> :: iterator i;
for( i = m_Resolutionlist.begin() ; i != m_Resolutionlist.end() ; i++ )
{
if(*i == resolution)
@@ -147,7 +149,7 @@ void CVideoDriver::verifyResolution( st_resolution& resolution, const int flags
if(i == m_Resolutionlist.end())
{
#ifdef DEBUG
- g_pLogFile->ftextOut(BLUE, "Resolution %ix%ix%i %X added\n", resolution.width, resolution.height, resolution.depth);
+ g_pLogFile->ftextOut(BLUE, "Resolution %ix%ix%i %X added\n", resolution.w, resolution.h, 32);
#endif
m_Resolutionlist.push_back(resolution);
}
@@ -157,7 +159,7 @@ void CVideoDriver::verifyResolution( st_resolution& resolution, const int flags
void CVideoDriver::setVidConfig(const CVidConfig& VidConf)
{
m_VidConfig = VidConf;
- setMode(m_VidConfig.m_Resolution);
+ setMode(m_VidConfig.m_DisplayRect);
}
void CVideoDriver::setSpecialFXMode(bool SpecialFX)
@@ -165,11 +167,11 @@ void CVideoDriver::setSpecialFXMode(bool SpecialFX)
void CVideoDriver::setMode(int width, int height,int depth)
{
- st_resolution res(width, height, depth);
+ CRect res(width, height);
setMode(res);
}
-void CVideoDriver::setMode(const st_resolution res)
+void CVideoDriver::setMode(const CRect& res)
{
m_VidConfig.setResolution(res);
@@ -192,11 +194,11 @@ extern "C" void iPhoneRotateScreen();
bool CVideoDriver::applyMode()
{
- const st_resolution &Res = m_VidConfig.m_Resolution;
- const SDL_Rect &GameRect = m_VidConfig.m_Gamescreen;
+ const CRect &Res = m_VidConfig.m_DisplayRect;
+ const CRect &GameRect = m_VidConfig.m_GameRect;
// Before the resolution is set, check, if the zoom factor is too high!
- while(((Res.width/GameRect.w) < m_VidConfig.Zoom || (Res.height/GameRect.h) < m_VidConfig.Zoom) && (m_VidConfig.Zoom > 1))
+ while(((Res.w/GameRect.w) < m_VidConfig.Zoom || (Res.h/GameRect.h) < m_VidConfig.Zoom) && (m_VidConfig.Zoom > 1))
m_VidConfig.Zoom--;
#if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR) || defined(ANDROID)
@@ -216,7 +218,7 @@ bool CVideoDriver::applyMode()
if( m_VidConfig.Zoom == 0 )
m_VidConfig.Zoom = 1;
- m_VidConfig.m_Resolution = *m_Resolution_pos;
+ m_VidConfig.m_DisplayRect = *m_Resolution_pos;
return true;
}
@@ -259,7 +261,7 @@ bool CVideoDriver::start()
// Now SDL will tell if the bpp works or changes it, if not supported.
// this value is updated here!
- m_VidConfig.m_Resolution.depth = mp_VideoEngine->getScreenSurface()->format->BitsPerPixel;
+ // m_VidConfig.m_Resolution.depth = mp_VideoEngine->getScreenSurface()->format->BitsPerPixel;
retval &= mp_VideoEngine->createSurfaces();
m_mustrefresh = true;
@@ -303,6 +305,7 @@ void CVideoDriver::updateScreen()
// "Console" here refers to the capability to pop up in-game messages
// in the upper-left corner during game play ala Doom.
+// TODO: These Messages should be drawn on the blit surface afterwards and not on the FGLayerSurface
void CVideoDriver::drawConsoleMessages(void)
{
if (!NumConsoleMessages)
@@ -397,13 +400,13 @@ bool CVideoDriver::getFullscreen()
{ return m_VidConfig.Fullscreen; }
unsigned int CVideoDriver::getWidth() const
-{ return m_VidConfig.m_Resolution.width; }
+{ return m_VidConfig.m_DisplayRect.w; }
unsigned int CVideoDriver::getHeight() const
-{ return m_VidConfig.m_Resolution.height; }
+{ return m_VidConfig.m_DisplayRect.h; }
unsigned short CVideoDriver::getDepth() const
-{ return m_VidConfig.m_Resolution.depth; }
+{ return 32; }
SDL_Surface *CVideoDriver::getScrollSurface()
{ return mp_VideoEngine->getScrollSurface(); }
diff --git a/src/sdl/CVideoDriver.h b/src/sdl/CVideoDriver.h
index a083c7b..a25fb2f 100644
--- a/src/sdl/CVideoDriver.h
+++ b/src/sdl/CVideoDriver.h
@@ -68,7 +68,7 @@ public:
unsigned int getWidth() const;
unsigned int getHeight() const;
unsigned short getDepth() const;
- SDL_Rect getGameResolution() { return m_VidConfig.m_Gamescreen; }
+ CRect getGameResolution() const { return m_VidConfig.m_GameRect; }
SDL_Surface *getBlitSurface() { return mp_VideoEngine->getBlitSurface(); }
@@ -82,7 +82,7 @@ public:
void setVidConfig(const CVidConfig& VidConf);
void setMode(int width, int height,int depth);
- void setMode(const st_resolution res);
+ void setMode(const CRect& res);
void setSpecialFXMode(bool SpecialFX);
void setFilter(short value);
void setZoom(short vale);
@@ -104,8 +104,8 @@ public:
* \return nothing. It does not return because it always adapts the resolution to some working mode.
* If video cannot be opened at all, another function of LibSDL will find that out.
*/
- void verifyResolution( st_resolution& resolution, const int flags );
- st_resolution getResolution() const { return *m_Resolution_pos; }
+ void verifyResolution( CRect& resolution, const int flags );
+ CRect& getResolution() const { return *m_Resolution_pos; }
void initResolutionList();
@@ -121,8 +121,8 @@ public:
CVideoEngine *mp_VideoEngine;
- std::list<st_resolution> m_Resolutionlist;
- std::list<st_resolution> :: iterator m_Resolution_pos;
+ std::list<CRect> m_Resolutionlist;
+ std::list<CRect> :: iterator m_Resolution_pos;
private:
diff --git a/src/sdl/resolutionlist.h b/src/sdl/resolutionlist.h
index 6a89d68..e27dcb7 100644
--- a/src/sdl/resolutionlist.h
+++ b/src/sdl/resolutionlist.h
@@ -17,8 +17,8 @@
const char* ResolutionsList[] =
{
-"320x200x16",
-"320x240x16",
+"320x200",
+"320x240",
"320x200",
"320x240",
"640x480",
diff --git a/src/sdl/video/COpenGL.cpp b/src/sdl/video/COpenGL.cpp
index 2e5ffe3..590c49f 100644
--- a/src/sdl/video/COpenGL.cpp
+++ b/src/sdl/video/COpenGL.cpp
@@ -30,20 +30,20 @@ COpenGL::COpenGL(const CVidConfig &VidConfig, Sint16 *&p_sbufferx, Sint16 *&p_sb
CVideoEngine(VidConfig, p_sbufferx, p_sbuffery),
m_opengl_buffer(NULL),
m_texparam(GL_TEXTURE_2D),
-m_aspectratio(m_VidConfig.m_Resolution.computeAspectRatio()),
-m_GamePOTBaseDim(getPowerOfTwo(m_VidConfig.m_Gamescreen.w),
- getPowerOfTwo(m_VidConfig.m_Gamescreen.h)),
-m_GamePOTVideoDim(getPowerOfTwo(m_VidConfig.m_Resolution.width),
- getPowerOfTwo(m_VidConfig.m_Resolution.height))
+m_aspectratio(m_VidConfig.m_DisplayRect.aspectRatio()),
+m_GamePOTBaseDim(getPowerOfTwo(m_VidConfig.m_GameRect.w),
+ getPowerOfTwo(m_VidConfig.m_GameRect.h)),
+m_GamePOTVideoDim(getPowerOfTwo(m_VidConfig.m_DisplayRect.w),
+ getPowerOfTwo(m_VidConfig.m_DisplayRect.h))
{}
bool COpenGL::createSurfaces()
{
// This function creates the surfaces which are needed for the game.
- const SDL_Rect &gamerect = m_VidConfig.m_Gamescreen;
+ const SDL_Rect &gamerect = m_VidConfig.m_GameRect;
ScrollSurface = createSurface( "ScrollSurface", true,
512, 512,
- m_VidConfig.m_Resolution.depth,
+ 32,
m_Mode, screen->format );
g_pLogFile->textOut("Blitsurface = creatergbsurface<br>");
@@ -51,21 +51,21 @@ bool COpenGL::createSurfaces()
BlitSurface = createSurface( "BlitSurface", true,
getPowerOfTwo(gamerect.w),
getPowerOfTwo(gamerect.h),
- m_VidConfig.m_Resolution.depth,
+ 32,
m_Mode, screen->format );
- m_blitsurface_alloc = true;
+ //m_blitsurface_alloc = true;
if(m_VidConfig.m_ScaleXFilter == 1)
{
FGLayerSurface = createSurface( "FGLayerSurface", true,
getPowerOfTwo(gamerect.w),
getPowerOfTwo(gamerect.h),
- m_VidConfig.m_Resolution.depth,
+ 32,
m_Mode, screen->format );
FXSurface = createSurface( "FXSurface", true,
getPowerOfTwo(gamerect.w),
getPowerOfTwo(gamerect.h),
- m_VidConfig.m_Resolution.depth,
+ 32,
m_Mode, screen->format );
}
else
@@ -73,7 +73,7 @@ bool COpenGL::createSurfaces()
FGLayerSurface = createSurface( "FGLayerSurface", false,
gamerect.w,
gamerect.h,
- m_VidConfig.m_Resolution.depth,
+ 32,
m_Mode, screen->format );
SDL_SetColorKey( FGLayerSurface, SDL_SRCCOLORKEY,
@@ -82,7 +82,7 @@ bool COpenGL::createSurfaces()
FXSurface = createSurface( "FXSurface", false,
gamerect.w,
gamerect.h,
- m_VidConfig.m_Resolution.depth,
+ 32,
m_Mode, screen->format );
//Set surface alpha
@@ -136,13 +136,6 @@ bool COpenGL::init()
{
CVideoEngine::init();
const GLint oglfilter = (m_VidConfig.m_opengl_filter==1) ? GL_LINEAR : GL_NEAREST ;
- if(m_VidConfig.m_Resolution.depth != 32)
- {
- // TODO: I know, this is an issue, but I need to investigate, how pixels in SDL are stored when using
- // 16 bit depth copy it correctly to the OGL Texture
- g_pLogFile->textOut("Sorry, but OpenGL with 16 bpp is not supported! Please switch to 32 bpp mode!");
- return false;
- }
// Calculate the proper viewport for any resolution
float base_width = g_pVideoDriver->getGameResolution().w;
@@ -194,7 +187,7 @@ bool COpenGL::init()
if(m_VidConfig.m_ScaleXFilter > 1)
{
- m_opengl_buffer = new char[m_GamePOTVideoDim.w*m_GamePOTVideoDim.h*m_VidConfig.m_ScaleXFilter*m_VidConfig.m_Resolution.depth];
+ m_opengl_buffer = new char[m_GamePOTVideoDim.w*m_GamePOTVideoDim.h*m_VidConfig.m_ScaleXFilter*4];
}
else
{ // In that case we can do a texture based rendering
diff --git a/src/sdl/video/CSDLVideo.cpp b/src/sdl/video/CSDLVideo.cpp
index aeb0980..4cdcebf 100644
--- a/src/sdl/video/CSDLVideo.cpp
+++ b/src/sdl/video/CSDLVideo.cpp
@@ -19,36 +19,36 @@ CVideoEngine(VidConfig, p_sbufferx, p_sbuffery)
bool CSDLVideo::createSurfaces()
{
// This function creates the surfaces which are needed for the game.
- const SDL_Rect &gamerect = m_VidConfig.m_Gamescreen;
+ const CRect &gamerect = m_VidConfig.m_GameRect;
ScrollSurface = createSurface( "ScrollSurface", true,
512,
512,
- m_VidConfig.m_Resolution.depth,
+ 32,
m_Mode, screen->format );
- if (m_VidConfig.m_Resolution.width == gamerect.w )
+/* if (m_VidConfig.m_Resolution.width == gamerect.w )
{
g_pLogFile->textOut("Blitsurface = Screen<br>");
BlitSurface = screen;
m_blitsurface_alloc = false;
}
- else
+ else*/
{
g_pLogFile->textOut("Blitsurface = creatergbsurfacefrom<br>");
BlitSurface = createSurface( "BlitSurface", true,
gamerect.w,
gamerect.h,
- m_VidConfig.m_Resolution.depth,
+ 32,
m_Mode, screen->format );
- m_blitsurface_alloc = true;
+ //m_blitsurface_alloc = true;
}
FGLayerSurface = createSurface( "FGLayerSurface", false,
gamerect.w,
gamerect.h,
- m_VidConfig.m_Resolution.depth,
+ 32,
m_Mode, screen->format );
SDL_SetColorKey( FGLayerSurface, SDL_SRCCOLORKEY,
@@ -57,7 +57,7 @@ bool CSDLVideo::createSurfaces()
FXSurface = createSurface( "FXSurface", false,
gamerect.w,
gamerect.h,
- m_VidConfig.m_Resolution.depth,
+ 32,
m_Mode, screen->format );
//Set surface alpha
@@ -73,8 +73,6 @@ void CSDLVideo::collectSurfaces()
if( getPerSurfaceAlpha(FXSurface) )
SDL_BlitSurface(FXSurface, NULL, BlitSurface, NULL);
-
-
}
void CSDLVideo::clearSurfaces()
@@ -86,30 +84,36 @@ void CSDLVideo::clearSurfaces()
void CSDLVideo::updateScreen()
{
- const SDL_Rect &gamerect = m_VidConfig.m_Gamescreen;
- const st_resolution &Resrect = m_VidConfig.m_Resolution;
+ const CRect &GameRect = m_VidConfig.m_GameRect;
+ const CRect &FilteredRect = m_VidConfig.m_FilteredRect;
+ const CRect &DisplayRect = m_VidConfig.m_DisplayRect;
+
+
+ // TODO: First apply the conventional filter (GameScreen -> FilteredScreen)
+
+
+ // TODO: Now scale up to the new DisplayRect (GameScreen -> FilteredScreen)
+
// pointer to the line in VRAM to start blitting to when stretchblitting.
// this may not be the first line on the display as it is adjusted to
// center the image on the screen when in fullscreen.
- Uint8 *ScreenPtr;
- Uint8 *BlitPtr;
- unsigned int width, height;
+ //Uint8 *ScreenPtr;
+ //Uint8 *BlitPtr;
+ //unsigned int width, height;
// if we're doing zoom then we have copied the scroll buffer into
// another offscreen buffer, and must now stretchblit it to the screen
- if (m_VidConfig.Zoom == 1 && Resrect.width != gamerect.w )
- {
+ //if (m_VidConfig.Zoom == 1 && Resrect.width != gamerect.w )
+ //{
SDL_Rect scrrect, dstrect;
- scrrect.y = 0;
- scrrect.x = 0;
- dstrect.h = scrrect.h = gamerect.h;
- dstrect.w = scrrect.w = gamerect.w;
- dstrect.x = (m_VidConfig.m_Resolution.width-gamerect.w)/2;
- dstrect.y = (m_VidConfig.m_Resolution.height-gamerect.h)/2;
+ dstrect.x = scrrect.y = 0;
+ dstrect.y = scrrect.x = 0;
+ dstrect.h = scrrect.h = GameRect.h;
+ dstrect.w = scrrect.w = GameRect.w;
SDL_BlitSurface(BlitSurface, &scrrect, screen, &dstrect);
- }
+ /*}
else
{
fetchStartScreenPixelPtrs(ScreenPtr, BlitPtr, width, height);
@@ -169,7 +173,7 @@ void CSDLVideo::updateScreen()
}
SDL_UnlockSurface(screen);
SDL_UnlockSurface(BlitSurface);
- }
+ }*/
SDL_Flip(screen);
diff --git a/src/sdl/video/CVideoEngine.cpp b/src/sdl/video/CVideoEngine.cpp
index 14cd479..ab52afb 100644
--- a/src/sdl/video/CVideoEngine.cpp
+++ b/src/sdl/video/CVideoEngine.cpp
@@ -16,7 +16,7 @@ BlitSurface(NULL),
FGLayerSurface(NULL), // Scroll buffer for Messages
ScrollSurface(NULL), // 512x512 scroll buffer
FXSurface(NULL),
-m_blitsurface_alloc(false),
+//m_blitsurface_alloc(false),
m_VidConfig(VidConfig),
mp_sbufferx(p_sbufferx),
mp_sbuffery(p_sbuffery),
@@ -26,8 +26,8 @@ m_Mode(0)
bool CVideoEngine::init()
{
- const st_resolution &Res = m_VidConfig.m_Resolution;
- const SDL_Rect &GameRect = m_VidConfig.m_Gamescreen;
+ const CRect &Res = m_VidConfig.m_DisplayRect;
+ const CRect &GameRect = m_VidConfig.m_GameRect;
// Setup mode depends on some systems.
#if defined(CAANOO) || defined(WIZ) || defined(DINGOO) || defined(NANONOTE) || defined(ANDROID)
@@ -58,7 +58,7 @@ bool CVideoEngine::init()
m_Mode |= SDL_FULLSCREEN;
// And leave the rest to SDL!
- screen = SDL_SetVideoMode( Res.width, Res.height, Res.depth, m_Mode );
+ screen = SDL_SetVideoMode( Res.w, Res.h, 32, m_Mode );
if(!screen)
{
@@ -70,7 +70,7 @@ bool CVideoEngine::init()
// Anyway, it just can point but does not interact yet
SDL_ShowCursor(!m_VidConfig.Fullscreen);
- m_dst_slice = Res.width*screen->format->BytesPerPixel;
+ m_dst_slice = Res.w*screen->format->BytesPerPixel;
m_src_slice = GameRect.w*screen->format->BytesPerPixel;
return true;
@@ -98,10 +98,10 @@ SDL_Surface* CVideoEngine::createSurface( std::string name, bool alpha, int widt
return optimized;
}
-void CVideoEngine::fetchStartScreenPixelPtrs(Uint8 *&ScreenPtr, Uint8 *&BlitPtr,
+/*void CVideoEngine::fetchStartScreenPixelPtrs(Uint8 *&ScreenPtr, Uint8 *&BlitPtr,
unsigned int &width, unsigned int &height)
{
- const st_resolution &Res = m_VidConfig.m_Resolution;
+ const resolution_t &Res = m_VidConfig.m_Resolution;
const SDL_Rect &GameScreen = m_VidConfig.m_Gamescreen;
const int xpos = (Res.width-GameScreen.w*m_VidConfig.Zoom)/2;
const int ypos = (Res.height-GameScreen.h*m_VidConfig.Zoom)/2;
@@ -120,8 +120,8 @@ void CVideoEngine::fetchStartScreenPixelPtrs(Uint8 *&ScreenPtr, Uint8 *&BlitPtr,
if(yoffset>0)
ScreenPtr += yoffset;
-}
-
+}*/
+/*
//void CVideoEngine::scale2xnofilter(char* dest, char* src, short bbp)
void CVideoEngine::scale2xnofilter(char* restrict dest, char* restrict src, short bbp)
{
@@ -129,7 +129,7 @@ void CVideoEngine::scale2xnofilter(char* restrict dest, char* restrict src, shor
// to 2x (without filter). This applies to 16 and 32-bit colour depth.
// It uses bit shifting method for faster blit!
bbp >>= 1;
- const st_resolution &Res = m_VidConfig.m_Resolution;
+ const resolution_t &Res = m_VidConfig.m_Resolution;
const SDL_Rect &GameRect = m_VidConfig.m_Gamescreen;
for( int i=0, j=0 ; i < GameRect.h ; i++ )
@@ -150,7 +150,7 @@ void CVideoEngine::scale3xnofilter(char* restrict dest, char* restrict src, shor
// to 2x (without filter). This applies to 16 and 32-bit colour depth.
// Optimization of using bit shifting
bbp >>= 1;
- const st_resolution &Res = m_VidConfig.m_Resolution;
+ const resolution_t &Res = m_VidConfig.m_Resolution;
const SDL_Rect &GameRect = m_VidConfig.m_Gamescreen;
for( int i=0, j=0 ; i < GameRect.h ; i++ )
@@ -174,7 +174,7 @@ void CVideoEngine::scale4xnofilter(char* restrict dest, char* restrict src, shor
// to 4x (without filter). This applies to 16 and 32-bit colour depth.
// use bit shifting method for faster blit!
bbp >>= 1;
- const st_resolution &Res = m_VidConfig.m_Resolution;
+ const CRect &Res = m_VidConfig.m_Resolution;
const SDL_Rect &GameRect = m_VidConfig.m_Gamescreen;
char* restrict srctemp;
@@ -201,7 +201,7 @@ void CVideoEngine::scale4xnofilter(char* restrict dest, char* restrict src, shor
memcpy(desttemp+(Res.width<<bbp),srctemp,size);
memcpy(desttemp+((Res.width<<bbp)<<1),srctemp,size);
}
-}
+}*/
void CVideoEngine::blitScrollSurface() // This is only for tiles
// The name should be changed
@@ -211,7 +211,7 @@ void CVideoEngine::blitScrollSurface() // This is only for tiles
Sint16 sbufferx, sbuffery;
char wraphoz, wrapvrt;
int save_dstx, save_dstw, save_srcx, save_srcw;
- const SDL_Rect &Gamerect = m_VidConfig.m_Gamescreen;
+ const SDL_Rect &Gamerect = m_VidConfig.m_GameRect;
dstrect.x = 0; dstrect.y = 0;
@@ -293,12 +293,13 @@ void CVideoEngine::blitScrollSurface() // This is only for tiles
void CVideoEngine::stop()
{
g_pLogFile->textOut(GREEN, "Freeing the following graphical surfaces:<br>\n");
- if(m_blitsurface_alloc && BlitSurface)
+ if(/*m_blitsurface_alloc &&*/ BlitSurface)
{
SDL_FreeSurface(BlitSurface);
g_pLogFile->textOut("freed BlitSurface<br>");
BlitSurface=NULL;
}
+
if(FGLayerSurface)
{
SDL_FreeSurface(FGLayerSurface);
diff --git a/src/sdl/video/CVideoEngine.h b/src/sdl/video/CVideoEngine.h
index fedbaf7..5121b51 100644
--- a/src/sdl/video/CVideoEngine.h
+++ b/src/sdl/video/CVideoEngine.h
@@ -53,7 +53,7 @@ protected:
SDL_Surface *ScrollSurface; // 512x512 scroll buffer
SDL_Surface *FXSurface;
- bool m_blitsurface_alloc;
+ //bool m_blitsurface_alloc;
const CVidConfig &m_VidConfig;
hooks/post-receive
--
clonekeenplus
|
|
From: Gerstrong <ger...@us...> - 2011-09-25 17:39:19
|
via e885ef59d79ff2cc3bef690d37b96e55aeb557cf (commit)
via 4ccd6c11d5a8cf07282f4ee65811c4109b0ede3e (commit)
via fc5539f8ddbd9f01f785856b9ae9be9d202860c1 (commit)
from 2793f76aa38716883647b78a4b243c6a8cda164b (commit)
- Log -----------------------------------------------------------------
commit e885ef59d79ff2cc3bef690d37b96e55aeb557cf
Author: Gerstrong <ger...@gm...>
Date: Sun Sep 25 19:38:23 2011 +0200
Many more cleanups, also throwed away some obsolete files
commit 4ccd6c11d5a8cf07282f4ee65811c4109b0ede3e
Author: Gerstrong <ger...@gm...>
Date: Sun Sep 25 18:36:22 2011 +0200
More cleanups and comments
commit fc5539f8ddbd9f01f785856b9ae9be9d202860c1
Author: Gerstrong <ger...@gm...>
Date: Sun Sep 25 17:34:07 2011 +0200
cleanups
-----------------------------------------------------------------------
Summary of changes:
src/CGame.cpp | 6 +-
src/common/CBehaviorEngine.h | 1 +
src/common/CMap.cpp | 1 -
src/common/CMapLoader.cpp | 1 -
src/common/CObject.cpp | 1 -
src/common/CObject.h | 1 -
src/common/CPlayer.cpp | 1 -
src/common/CPlayer.h | 9 ++-
src/common/CPlayerItems.cpp | 1 -
src/common/CPlayerLevel.cpp | 6 ++-
src/common/CPlayerWM.cpp | 1 -
src/common/Menu/CControlsettings.cpp | 7 +-
src/common/tga.cpp | 1 -
src/dialog/CDialog.cpp | 1 -
src/dialog/CTextViewer.cpp | 2 -
src/engine/CCamera.cpp | 2 +-
src/engine/CMessages.h | 1 -
src/engine/infoscenes/CCredits.cpp | 1 -
src/engine/infoscenes/COrderingInfo.cpp | 1 -
src/engine/playgame/CPlayGame.h | 3 +
src/engine/vorticon/CEGALatch.cpp | 1 -
src/engine/vorticon/CEGASprit.h | 5 +-
src/engine/vorticon/ai/CAnkhShield.cpp | 2 +-
src/engine/vorticon/ai/CAutoRay.cpp | 4 +-
src/engine/vorticon/ai/CBallJack.cpp | 2 +-
src/engine/vorticon/ai/CBridges.cpp | 6 +-
src/engine/vorticon/ai/CButler.cpp | 1 -
src/engine/vorticon/ai/CDoor.cpp | 3 +-
src/engine/vorticon/ai/CIceCannon.cpp | 5 +-
src/engine/vorticon/ai/CMessie.h | 7 ++-
src/engine/vorticon/ai/CObjectAI.h | 3 -
src/engine/vorticon/ai/CPlatformVert.cpp | 2 +-
src/engine/vorticon/ai/CRope.cpp | 7 +-
src/engine/vorticon/ai/CSectorEffector.cpp | 2 +-
src/engine/vorticon/ai/CSpark.h | 4 +-
src/engine/vorticon/ai/CTank.cpp | 5 +-
src/engine/vorticon/ai/enemydata.h | 13 ----
src/engine/vorticon/finale/CShipFlySys.h | 3 +-
src/engine/vorticon/playgame/CPlayGameVorticon.cpp | 1 -
src/engine/vorticon/playgame/CPlayGameWorldMap.cpp | 3 +
src/fileio.cpp | 1 -
src/fileio/Oldsavegamestructs.h | 6 +-
src/fileio/ResourceMgmt.cpp | 1 -
src/keen.h | 43 ------------
src/main.cpp | 16 +++--
src/sdl/CTimer.cpp | 5 +-
src/sdl/CVideoDriver.cpp | 68 ++++++++++----------
src/sdl/CVideoDriver.h | 15 +++-
src/sdl/sound/CSound.cpp | 1 -
49 files changed, 116 insertions(+), 167 deletions(-)
delete mode 100644 src/engine/vorticon/ai/enemydata.h
delete mode 100644 src/keen.h
diff --git a/src/CGame.cpp b/src/CGame.cpp
index 8e5b465..2a5f35a 100644
--- a/src/CGame.cpp
+++ b/src/CGame.cpp
@@ -19,7 +19,8 @@
#include "sdl/CTimer.h"
#include "sdl/sound/CSound.h"
-CGame::CGame() : m_firsttime(false),
+CGame::CGame() :
+m_firsttime(false),
m_Engine(m_firsttime)
{}
@@ -37,7 +38,6 @@ m_Engine(m_firsttime)
* \return If the function could setup
* the game, it will return true, else it
* will be false.
- *
*/
bool CGame::init(int argc, char *argv[])
{
@@ -89,8 +89,6 @@ bool CGame::loadCKPDrivers()
g_pSound->init();
- // g_pInput is started automatically when needed!
-
return true;
}
diff --git a/src/common/CBehaviorEngine.h b/src/common/CBehaviorEngine.h
index f77fff4..9de169c 100644
--- a/src/common/CBehaviorEngine.h
+++ b/src/common/CBehaviorEngine.h
@@ -28,6 +28,7 @@
#include "CSingleton.h"
+#define MAX_PLAYERS 4
#define g_pBehaviorEngine CBehaviorEngine::Get()
diff --git a/src/common/CMap.cpp b/src/common/CMap.cpp
index d53ed3e..b1747a5 100644
--- a/src/common/CMap.cpp
+++ b/src/common/CMap.cpp
@@ -5,7 +5,6 @@
* Author: gerstrong
*/
-#include "keen.h"
#include "CMap.h"
#include "common/CBehaviorEngine.h"
#include "FindFile.h"
diff --git a/src/common/CMapLoader.cpp b/src/common/CMapLoader.cpp
index 4bd6873..215a71a 100644
--- a/src/common/CMapLoader.cpp
+++ b/src/common/CMapLoader.cpp
@@ -6,7 +6,6 @@
*/
#include "CMapLoader.h"
-#include "keen.h"
#include <iostream>
#include <fstream>
#include "FindFile.h"
diff --git a/src/common/CObject.cpp b/src/common/CObject.cpp
index 1ad268e..04edce5 100644
--- a/src/common/CObject.cpp
+++ b/src/common/CObject.cpp
@@ -9,7 +9,6 @@
#include "CLogFile.h"
#include "engine/spritedefines.h"
#include "sdl/CVideoDriver.h"
-#include "keen.h"
int CObject::m_number_of_objects = 0; // The current number of total objects we have within the game!
diff --git a/src/common/CObject.h b/src/common/CObject.h
index e64dd84..bddb415 100644
--- a/src/common/CObject.h
+++ b/src/common/CObject.h
@@ -19,7 +19,6 @@
#include "CBehaviorEngine.h"
// structures for each AI module's data
-#include "engine/vorticon/ai/enemydata.h"
#include "CMap.h"
#include "graphics/CGfxEngine.h"
#include "options.h"
diff --git a/src/common/CPlayer.cpp b/src/common/CPlayer.cpp
index dbbdd4f..fc8da0a 100644
--- a/src/common/CPlayer.cpp
+++ b/src/common/CPlayer.cpp
@@ -12,7 +12,6 @@
#include "CPlayer.h"
-#include "keen.h"
#include "sdl/CInput.h"
#include "sdl/sound/CSound.h"
#include "sdl/CVideoDriver.h"
diff --git a/src/common/CPlayer.h b/src/common/CPlayer.h
index 80bed90..4bdcd12 100644
--- a/src/common/CPlayer.h
+++ b/src/common/CPlayer.h
@@ -20,10 +20,15 @@
#include <string>
#include "common/CBehaviorEngine.h"
-enum level_triggers{
- LVLTRIG_NONE, LVLTRIG_TANTALUS_RAY, LVLTRIG_BRIDGE, LVLTRIG_LIGHT
+enum level_triggers
+{
+ LVLTRIG_NONE,
+ LVLTRIG_TANTALUS_RAY,
+ LVLTRIG_BRIDGE,
+ LVLTRIG_LIGHT
};
+
///
// Class definition starts here!
///
diff --git a/src/common/CPlayerItems.cpp b/src/common/CPlayerItems.cpp
index ba103a6..d6db1bd 100644
--- a/src/common/CPlayerItems.cpp
+++ b/src/common/CPlayerItems.cpp
@@ -11,7 +11,6 @@
#include "CPlayer.h"
-#include "keen.h"
#include "sdl/sound/CSound.h"
#include "graphics/CGfxEngine.h"
#include "engine/spritedefines.h"
diff --git a/src/common/CPlayerLevel.cpp b/src/common/CPlayerLevel.cpp
index 271c227..925bdb9 100644
--- a/src/common/CPlayerLevel.cpp
+++ b/src/common/CPlayerLevel.cpp
@@ -11,7 +11,6 @@
#include "engine/vorticon/ai/CRay.h"
#include "engine/vorticon/ai/CBridges.h"
#include "engine/spritedefines.h"
-#include "keen.h"
#include "sdl/sound/CSound.h"
#include "sdl/CInput.h"
#include "sdl/music/CMusic.h"
@@ -280,6 +279,11 @@ void CPlayer::setDir()
}
}
+#define TILE_SWITCH_UP 480
+#define TILE_SWITCH_DOWN 493
+#define TILE_LIGHTSWITCH 271
+
+
// allow Keen to toggle the pogo stick and hit switches
void CPlayer::TogglePogo_and_Switches()
{
diff --git a/src/common/CPlayerWM.cpp b/src/common/CPlayerWM.cpp
index af047b4..6a2d61f 100644
--- a/src/common/CPlayerWM.cpp
+++ b/src/common/CPlayerWM.cpp
@@ -9,7 +9,6 @@
#include "engine/vorticon/ai/CMessie.h"
#include "graphics/CGfxEngine.h"
#include "sdl/CInput.h"
-#include "keen.h"
///
// Process Part
diff --git a/src/common/Menu/CControlsettings.cpp b/src/common/Menu/CControlsettings.cpp
index b45f3ff..6ff4778 100644
--- a/src/common/Menu/CControlsettings.cpp
+++ b/src/common/Menu/CControlsettings.cpp
@@ -5,13 +5,14 @@
* Author: gerstrong
*/
-#include "CControlsettings.h"
+#include "StringUtils.h"
#include "CSelectionMenu.h"
-#include "keen.h"
+#include "CControlsettings.h"
+#include "common/CBehaviorEngine.h"
+
#include "sdl/CInput.h"
#include "sdl/CSettings.h"
#include "sdl/CVideoDriver.h"
-#include "StringUtils.h"
const std::string actionsnames[MAX_COMMANDS] =
{
diff --git a/src/common/tga.cpp b/src/common/tga.cpp
index 10030ed..7df3c85 100644
--- a/src/common/tga.cpp
+++ b/src/common/tga.cpp
@@ -7,7 +7,6 @@
#include <stdio.h>
#include "tga.h"
-#include "keen.h"
#include "fileio.h"
#include "FindFile.h"
#include "CLogFile.h"
diff --git a/src/dialog/CDialog.cpp b/src/dialog/CDialog.cpp
index ba15c65..aa78db7 100644
--- a/src/dialog/CDialog.cpp
+++ b/src/dialog/CDialog.cpp
@@ -5,7 +5,6 @@
* Author: gerstrong
*/
-#include "keen.h"
#include "StringUtils.h"
#include "CLogFile.h"
#include "sdl/CTimer.h"
diff --git a/src/dialog/CTextViewer.cpp b/src/dialog/CTextViewer.cpp
index b56ddd0..c3caeec 100644
--- a/src/dialog/CTextViewer.cpp
+++ b/src/dialog/CTextViewer.cpp
@@ -5,8 +5,6 @@
* Author: gerstrong
*/
-#include "keen.h"
-
#include <fstream>
#include "sdl/CInput.h"
diff --git a/src/engine/CCamera.cpp b/src/engine/CCamera.cpp
index 54b6756..8cfd360 100644
--- a/src/engine/CCamera.cpp
+++ b/src/engine/CCamera.cpp
@@ -13,7 +13,7 @@
#include "CLogFile.h"
#include "sdl/CVideoDriver.h"
#include "sdl/CInput.h"
-#include "spritedefines.h"
+#include "engine/spritedefines.h"
CCamera::CCamera(CMap *pmap, Uint32 x, Uint32 y, CObject *p_attacher) :
CObject(pmap, x, y, OBJ_NONE),
diff --git a/src/engine/CMessages.h b/src/engine/CMessages.h
index 68c78b2..f4dc61a 100644
--- a/src/engine/CMessages.h
+++ b/src/engine/CMessages.h
@@ -8,7 +8,6 @@
#ifndef CMESSAGES_H_
#define CMESSAGES_H_
-#include "keen.h"
#include <string>
#include <map>
diff --git a/src/engine/infoscenes/CCredits.cpp b/src/engine/infoscenes/CCredits.cpp
index bd7e234..2abca82 100644
--- a/src/engine/infoscenes/CCredits.cpp
+++ b/src/engine/infoscenes/CCredits.cpp
@@ -5,7 +5,6 @@
* Author: gerstrong
*/
-#include "../../keen.h"
#include "CCredits.h"
#include "../../sdl/CInput.h"
#include "../../sdl/CVideoDriver.h"
diff --git a/src/engine/infoscenes/COrderingInfo.cpp b/src/engine/infoscenes/COrderingInfo.cpp
index 5cd9381..e1e7ff7 100644
--- a/src/engine/infoscenes/COrderingInfo.cpp
+++ b/src/engine/infoscenes/COrderingInfo.cpp
@@ -5,7 +5,6 @@
* Author: gerstrong
*/
-//#include "../../keen.h"
#include "COrderingInfo.h"
#include "../../sdl/CInput.h"
#include "../../CLogFile.h"
diff --git a/src/engine/playgame/CPlayGame.h b/src/engine/playgame/CPlayGame.h
index af36fad..4bd5a66 100644
--- a/src/engine/playgame/CPlayGame.h
+++ b/src/engine/playgame/CPlayGame.h
@@ -18,6 +18,9 @@
#include <string>
#include <SDL.h>
+const int WM_MAP_NUM = 80;
+
+
class CPlayGame{
public:
CPlayGame(CExeFile &ExeFile, char level,
diff --git a/src/engine/vorticon/CEGALatch.cpp b/src/engine/vorticon/CEGALatch.cpp
index 6802705..e1f6050 100644
--- a/src/engine/vorticon/CEGALatch.cpp
+++ b/src/engine/vorticon/CEGALatch.cpp
@@ -14,7 +14,6 @@
#include "common/CBehaviorEngine.h"
#include "CLogFile.h"
#include "engine/CPlanes.h"
-#include "keen.h"
#include "FindFile.h"
#include <SDL.h>
#include <stdio.h>
diff --git a/src/engine/vorticon/CEGASprit.h b/src/engine/vorticon/CEGASprit.h
index 20b6070..08237c9 100644
--- a/src/engine/vorticon/CEGASprit.h
+++ b/src/engine/vorticon/CEGASprit.h
@@ -11,10 +11,9 @@
#include <string>
#include <SDL.h>
#include <vector>
-#include "../../graphics/CGfxEngine.h"
-#include "../../common/CTileProperties.h"
+#include "graphics/CGfxEngine.h"
+#include "common/CTileProperties.h"
-#define MAX_PLAYERS 4
// Reference to palette.c
char pal_addcolor(unsigned char r, unsigned char g, unsigned char b);
diff --git a/src/engine/vorticon/ai/CAnkhShield.cpp b/src/engine/vorticon/ai/CAnkhShield.cpp
index 2a3cdaf..ed78475 100644
--- a/src/engine/vorticon/ai/CAnkhShield.cpp
+++ b/src/engine/vorticon/ai/CAnkhShield.cpp
@@ -6,7 +6,7 @@
*/
#include "CAnkhShield.h"
-#include "../../spritedefines.h"
+#include "engine/spritedefines.h"
const unsigned int ANKH_FLICKER_DELAY = 3;
const unsigned int ANKH_SHIELD_FRAME = 61;
diff --git a/src/engine/vorticon/ai/CAutoRay.cpp b/src/engine/vorticon/ai/CAutoRay.cpp
index 1ffa829..812e303 100644
--- a/src/engine/vorticon/ai/CAutoRay.cpp
+++ b/src/engine/vorticon/ai/CAutoRay.cpp
@@ -6,8 +6,8 @@
* Port by: Gerstrong
*/
-#include "../../spritedefines.h"
-#include "../../../sdl/sound/CSound.h"
+#include "engine/spritedefines.h"
+#include "sdl/sound/CSound.h"
#include "CRay.h"
#include "CAutoRay.h"
diff --git a/src/engine/vorticon/ai/CBallJack.cpp b/src/engine/vorticon/ai/CBallJack.cpp
index fb047c3..e14e145 100644
--- a/src/engine/vorticon/ai/CBallJack.cpp
+++ b/src/engine/vorticon/ai/CBallJack.cpp
@@ -1,6 +1,6 @@
// ai for the ball and the jack in ep3
#include "CBallJack.h"
-#include "../../spritedefines.h"
+#include "engine/spritedefines.h"
#define BALL_SPEED 120
#define JACK_SPEED 120
diff --git a/src/engine/vorticon/ai/CBridges.cpp b/src/engine/vorticon/ai/CBridges.cpp
index 8637ff3..80f3b83 100644
--- a/src/engine/vorticon/ai/CBridges.cpp
+++ b/src/engine/vorticon/ai/CBridges.cpp
@@ -6,11 +6,13 @@
*/
#include "CBridges.h"
-#include "../../spritedefines.h"
-#include "../../../CLogFile.h"
+#include "engine/spritedefines.h"
+#include "CLogFile.h"
unsigned int CBridges::m_bgtile = 0;
+const int TILE_EXTENDING_PLATFORM = 270;
+
CBridges::CBridges(CMap *pmap, Uint32 x, Uint32 y, Uint32 platx, Uint32 platy):
CObject(pmap, x, y, OBJ_BRIDGE),
m_state(EXTEND),
diff --git a/src/engine/vorticon/ai/CButler.cpp b/src/engine/vorticon/ai/CButler.cpp
index b2179d6..4941832 100644
--- a/src/engine/vorticon/ai/CButler.cpp
+++ b/src/engine/vorticon/ai/CButler.cpp
@@ -1,5 +1,4 @@
#include "CButler.h"
-#include "keen.h"
#include "sdl/sound/CSound.h"
#include "graphics/CGfxEngine.h"
#include "common/CBehaviorEngine.h"
diff --git a/src/engine/vorticon/ai/CDoor.cpp b/src/engine/vorticon/ai/CDoor.cpp
index 8d4e39f..190d9b5 100644
--- a/src/engine/vorticon/ai/CDoor.cpp
+++ b/src/engine/vorticon/ai/CDoor.cpp
@@ -1,7 +1,6 @@
#include "CDoor.h"
-#include "../../../keen.h"
-#include "../../../graphics/CGfxEngine.h"
+#include "graphics/CGfxEngine.h"
CDoor::CDoor(CMap *pmap, Uint32 x, Uint32 y, Uint32 doorspriteID):
CObject(pmap, x, y, OBJ_DOOR)
diff --git a/src/engine/vorticon/ai/CIceCannon.cpp b/src/engine/vorticon/ai/CIceCannon.cpp
index 3d4b204..ebe9b87 100644
--- a/src/engine/vorticon/ai/CIceCannon.cpp
+++ b/src/engine/vorticon/ai/CIceCannon.cpp
@@ -1,7 +1,6 @@
#include "CIceCannon.h"
-#include "../../spritedefines.h"
-#include "../../../keen.h"
-#include "../../../sdl/sound/CSound.h"
+#include "engine/spritedefines.h"
+#include "sdl/sound/CSound.h"
// the chunks of ice shot out by an ice cannon (ep1)
const int ICECHUNK_SPEED = 60;
diff --git a/src/engine/vorticon/ai/CMessie.h b/src/engine/vorticon/ai/CMessie.h
index c43142d..bfce13a 100644
--- a/src/engine/vorticon/ai/CMessie.h
+++ b/src/engine/vorticon/ai/CMessie.h
@@ -11,7 +11,12 @@
#include "common/CObject.h"
#include "common/CPlayer.h"
-#define NESSIETRAILLEN 5
+// World Map Code for Nessie
+const int NESSIE_PATH = 8192;
+const int NESSIE_WEED = 8448;
+const int NESSIE_LAND = 8704;
+
+const int NESSIETRAILLEN = 5;
class CMessie : public CObject
{
diff --git a/src/engine/vorticon/ai/CObjectAI.h b/src/engine/vorticon/ai/CObjectAI.h
index bd1df76..c9820b8 100644
--- a/src/engine/vorticon/ai/CObjectAI.h
+++ b/src/engine/vorticon/ai/CObjectAI.h
@@ -8,7 +8,6 @@
#ifndef COBJECTAI_H_
#define COBJECTAI_H_
-#include "keen.h"
#include "common/CMap.h"
#include "common/CObject.h"
#include "common/options.h"
@@ -116,8 +115,6 @@ private:
Uint8& m_difficulty;
int m_gunfiretimer;
bool &m_dark;
- unsigned int m_bgtile; // Used as holder for bridges
-
};
#endif /* COBJECTAI_H_ */
diff --git a/src/engine/vorticon/ai/CPlatformVert.cpp b/src/engine/vorticon/ai/CPlatformVert.cpp
index 1d375bb..ddae608 100644
--- a/src/engine/vorticon/ai/CPlatformVert.cpp
+++ b/src/engine/vorticon/ai/CPlatformVert.cpp
@@ -1,5 +1,5 @@
#include "CPlatform.h"
-#include "../../spritedefines.h"
+#include "engine/spritedefines.h"
// vertically-moving platform (ep3)
enum platver_actions{
diff --git a/src/engine/vorticon/ai/CRope.cpp b/src/engine/vorticon/ai/CRope.cpp
index 13c0a83..d9c5d6b 100644
--- a/src/engine/vorticon/ai/CRope.cpp
+++ b/src/engine/vorticon/ai/CRope.cpp
@@ -1,7 +1,6 @@
-#include "../../../graphics/effects/CVibrate.h"
-#include "../../spritedefines.h"
-#include "../../../sdl/sound/CSound.h"
-#include "../../../keen.h"
+#include "graphics/effects/CVibrate.h"
+#include "engine/spritedefines.h"
+#include "sdl/sound/CSound.h"
#include "CVorticon.h"
#include "CRope.h"
diff --git a/src/engine/vorticon/ai/CSectorEffector.cpp b/src/engine/vorticon/ai/CSectorEffector.cpp
index e0d5081..a5cff6a 100644
--- a/src/engine/vorticon/ai/CSectorEffector.cpp
+++ b/src/engine/vorticon/ai/CSectorEffector.cpp
@@ -3,7 +3,7 @@
#include "CRay.h"
#include "CSectorEffector.h"
-#include "../../spritedefines.h"
+#include "engine/spritedefines.h"
#include "sdl/sound/CSound.h"
#include "CLogFile.h"
#include "graphics/effects/CVibrate.h"
diff --git a/src/engine/vorticon/ai/CSpark.h b/src/engine/vorticon/ai/CSpark.h
index 232a69f..e2df76e 100644
--- a/src/engine/vorticon/ai/CSpark.h
+++ b/src/engine/vorticon/ai/CSpark.h
@@ -8,8 +8,8 @@
#ifndef CSPARK_H_
#define CSPARK_H_
-#include "../../../common/CObject.h"
-#include "../../spritedefines.h"
+#include "common/CObject.h"
+#include "engine/spritedefines.h"
class CSpark : public CObject {
public:
diff --git a/src/engine/vorticon/ai/CTank.cpp b/src/engine/vorticon/ai/CTank.cpp
index 90cc888..1c9cb47 100644
--- a/src/engine/vorticon/ai/CTank.cpp
+++ b/src/engine/vorticon/ai/CTank.cpp
@@ -1,7 +1,6 @@
#include "CObjectAI.h"
-#include "../../spritedefines.h"
-#include "../../../sdl/sound/CSound.h"
-#include "../../../keen.h"
+#include "engine/spritedefines.h"
+#include "sdl/sound/CSound.h"
#include "CTank.h"
#include "CRay.h"
diff --git a/src/engine/vorticon/ai/enemydata.h b/src/engine/vorticon/ai/enemydata.h
deleted file mode 100644
index f0d3468..0000000
--- a/src/engine/vorticon/ai/enemydata.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * enemydata.h
- *
- * Created on: 05.08.2009
- * Author: gerstrong
- */
-
-#ifndef ENEMYDATA_H_
-#define ENEMYDATA_H_
-
-#include "../../../keen.h"
-
-#endif /* ENEMYDATA_H_ */
diff --git a/src/engine/vorticon/finale/CShipFlySys.h b/src/engine/vorticon/finale/CShipFlySys.h
index 0b2facb..2542f1b 100644
--- a/src/engine/vorticon/finale/CShipFlySys.h
+++ b/src/engine/vorticon/finale/CShipFlySys.h
@@ -8,8 +8,7 @@
#ifndef CSHIPFLYSYS_H_
#define CSHIPFLYSYS_H_
-#include "../../../keen.h"
-#include "../../../common/CPlayer.h"
+#include "common/CPlayer.h"
#define CMD_MOVE 0
#define CMD_WAIT 1
diff --git a/src/engine/vorticon/playgame/CPlayGameVorticon.cpp b/src/engine/vorticon/playgame/CPlayGameVorticon.cpp
index fbf31fe..ba7c8d4 100644
--- a/src/engine/vorticon/playgame/CPlayGameVorticon.cpp
+++ b/src/engine/vorticon/playgame/CPlayGameVorticon.cpp
@@ -7,7 +7,6 @@
*/
#include "CPlayGameVorticon.h"
-#include "keen.h"
#include "sdl/CTimer.h"
#include "sdl/CVideoDriver.h"
#include "sdl/sound/CSound.h"
diff --git a/src/engine/vorticon/playgame/CPlayGameWorldMap.cpp b/src/engine/vorticon/playgame/CPlayGameWorldMap.cpp
index 0e8d070..72fb061 100644
--- a/src/engine/vorticon/playgame/CPlayGameWorldMap.cpp
+++ b/src/engine/vorticon/playgame/CPlayGameWorldMap.cpp
@@ -14,6 +14,9 @@
#include "graphics/effects/CColorMerge.h"
#include "sdl/sound/CSound.h"
#include "engine/vorticon/ai/CTeleporter.h"
+#include "engine/vorticon/ai/CMessie.h"
+
+const int LVLS_SHIP = 20;
void CPlayGameVorticon::processOnWorldMap()
{
diff --git a/src/fileio.cpp b/src/fileio.cpp
index e1b3cd8..45eb9a0 100644
--- a/src/fileio.cpp
+++ b/src/fileio.cpp
@@ -7,7 +7,6 @@
#include <vector>
#include <stdio.h>
-#include "keen.h"
#include "sdl/CVideoDriver.h"
#include "sdl/sound/CSound.h"
#include "fileio.h"
diff --git a/src/fileio/Oldsavegamestructs.h b/src/fileio/Oldsavegamestructs.h
index 8d3106e..5d38ff7 100644
--- a/src/fileio/Oldsavegamestructs.h
+++ b/src/fileio/Oldsavegamestructs.h
@@ -12,12 +12,12 @@
* Please do never ever use them in the engine... !!!!!!
*/
-#define MAX_LEVELS 100
+#define MAX_LEVELS_V4 100 // Depracated for older formats
+#define MAX_LEVELS_VORTICON 20
#ifndef OLDSAVEGAMESTRUCTS_H_
#define OLDSAVEGAMESTRUCTS_H_
-#include "keen.h"
#include "common/Playerdefines.h"
#include "common/inventory.h"
@@ -217,7 +217,7 @@ struct OldSaveGameFormatV4
// array of which levels have been completed (have "Done" tiles over them
// on the world map)
- int levels_completed[MAX_LEVELS+1];
+ int levels_completed[MAX_LEVELS_V4+1];
// exitXpos: the X pixel position (not <<CSFed) of the frame of the exit
// door. when walking out the door, keen's sprite will not be drawn past
diff --git a/src/fileio/ResourceMgmt.cpp b/src/fileio/ResourceMgmt.cpp
index 63239c6..f8526a6 100644
--- a/src/fileio/ResourceMgmt.cpp
+++ b/src/fileio/ResourceMgmt.cpp
@@ -11,7 +11,6 @@
#include "ResourceMgmt.h"
#include "FindFile.h"
#include "CLogFile.h"
-#include "keen.h"
const std::string GLOBAL_DIR = "global";
diff --git a/src/keen.h b/src/keen.h
deleted file mode 100644
index ca13414..0000000
--- a/src/keen.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef __KEEN_H__
-#define __KEEN_H__
-
-#include <cstdio>
-#include <cstring>
-#include <cstdlib>
-
-#ifdef TARGET_WIN32
-#include <windows.h>
-#endif
-
-//#define CSF 9
-//#define TILE_S 4
-//#define STC (CSF-TILE_S)
-
-#define WM_MAP_NUM 80
-
-#define MAX_LEVELS_VORTICON 20
-
-// default sprites...when an object is spawned it's sprite is set to this
-// sprite. the object AI will immediately reset the sprite frame, so it
-// wouldn't really matter what these are...except that it does because
-// the width and height of the default sprite will determine exactly when
-// the object because active the first time it scrolls onto the screen
-// from the top or left. if the default sprite is wrong the object may
-// suddenly appear on the screen instead of smoothly scrolling on.
-
-// special level codes on worldmap
-#define LVLS_SHIP 20
-
-#define TILE_SWITCH_UP 480
-#define TILE_SWITCH_DOWN 493
-#define TILE_LIGHTSWITCH 271
-#define TILE_EXTENDING_PLATFORM 270
-
-// special object markers
-#define NESSIE_PATH 8192
-#define NESSIE_WEED 8448
-#define NESSIE_LAND 8704
-
-#define MAX_PLAYERS 4
-
-#endif
diff --git a/src/main.cpp b/src/main.cpp
index 35f33d2..bef46d0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -49,18 +49,24 @@
*/
int main(int argc, char *argv[])
{
- if(argc >= 1) {
+ if(argc >= 1)
+ {
binary_dir = argv[0];
size_t slashpos = findLastPathSep(binary_dir);
- if(slashpos != std::string::npos) {
+ if(slashpos != std::string::npos)
+ {
binary_dir.erase(slashpos);
binary_dir = SystemNativeToUtf8(binary_dir);
- } else
+ }
+ else
binary_dir = ".";
- } else {
+ }
+ else
+ {
warnings << "Binary-argument not given, assuming current dir" << endl;
binary_dir = ".";
}
+
binary_dir = GetAbsolutePath(binary_dir);
InitThreadPool();
@@ -87,7 +93,7 @@ int main(int argc, char *argv[])
g_pLogFile->Del();
- printf("Thank you very much for playing this wonderful game!\n\n");
+ std::cout << "Thank you very much for playing this wonderful game!" << std::endl;
UnInitThreadPool();
return 0;
diff --git a/src/sdl/CTimer.cpp b/src/sdl/CTimer.cpp
index d386ae7..256ec6c 100644
--- a/src/sdl/CTimer.cpp
+++ b/src/sdl/CTimer.cpp
@@ -36,11 +36,10 @@
*/
#include <SDL.h>
-#include "../keen.h"
#include "CTimer.h"
#include "CVideoDriver.h"
-#include "../CLogFile.h"
-#include "../StringUtils.h"
+#include "CLogFile.h"
+#include "StringUtils.h"
CTimer::CTimer()
{
diff --git a/src/sdl/CVideoDriver.cpp b/src/sdl/CVideoDriver.cpp
index ed8c29e..c63ef72 100644
--- a/src/sdl/CVideoDriver.cpp
+++ b/src/sdl/CVideoDriver.cpp
@@ -16,7 +16,6 @@
#include "video/COpenGL.h"
#include "resolutionlist.h"
-#include "keen.h"
#include "graphics/CGfxEngine.h"
#include "scale2x/scalebit.h"
#include "CLogFile.h"
@@ -25,7 +24,7 @@
#include <iostream>
#include <fstream>
-#define CKLOGFILENAME "genius.log"
+const std::string CKLOGFILENAME = "genius.log";
#define MAX_CONSOLE_MESSAGES 3
#define CONSOLE_MESSAGE_X 3
@@ -306,7 +305,9 @@ void CVideoDriver::updateScreen()
// in the upper-left corner during game play ala Doom.
void CVideoDriver::drawConsoleMessages(void)
{
- if (!NumConsoleMessages) return;
+ if (!NumConsoleMessages)
+ return;
+
if (!ConsoleExpireTimer)
{
NumConsoleMessages--;
@@ -333,8 +334,7 @@ void CVideoDriver::DeleteConsoleMsgs(void)
// other existing messages downwards
void CVideoDriver::AddConsoleMsg(const char *the_msg)
{
- int i;
- for(i=MAX_CONSOLE_MESSAGES-2;i>=0;i--)
+ for( int i=MAX_CONSOLE_MESSAGES-2 ; i>=0 ; i-- )
{
strcpy(cmsg[i+1].msg, cmsg[i].msg);
}
@@ -344,10 +344,11 @@ void CVideoDriver::AddConsoleMsg(const char *the_msg)
ConsoleExpireTimer = CONSOLE_EXPIRE_RATE;
}
+
+
+
void CVideoDriver::saveCameraBounds(st_camera_bounds &CameraBounds)
{
- int i;
-
int &left = CameraBounds.left;
int &up = CameraBounds.up;
int &right = CameraBounds.right;
@@ -356,23 +357,24 @@ void CVideoDriver::saveCameraBounds(st_camera_bounds &CameraBounds)
if(left>right)
{
- i = left-right;
- i = i/2;
- left = left-i;
- right = right+i;
+ const int halfWidth = (left-right)/2;
+ left -= halfWidth;
+ right += halfWidth;
if(left>right)
- left = left-1;
+ left--;
}
+
if(up>down)
{
- i = up-down;
- i = i/2;
- up = up-i;
- down = down+i;
+ const int halfHeight = (up-down)/2;
+ up -= halfHeight;
+ down += halfHeight;
if(up>down)
- up = up-1;
+ up--;
}
- bool invalid_value = (left<50) || (up<50) || (right<50) || (down<50) || (speed<1) || (left>270) || (up>150) || (right>270) || (down>150) || (speed>50);
+
+ bool invalid_value = (left<50) || (up<50) || (right<50) || (down<50) || (speed<1) ||
+ (left>270) || (up>150) || (right>270) || (down>150) || (speed>50);
st_camera_bounds &cam = m_VidConfig.m_CameraBounds;
@@ -382,34 +384,32 @@ void CVideoDriver::saveCameraBounds(st_camera_bounds &CameraBounds)
cam = CameraBounds;
}
-CVidConfig &CVideoDriver::getVidConfig() { return m_VidConfig; }
+CVidConfig &CVideoDriver::getVidConfig()
+{ return m_VidConfig; }
-short CVideoDriver::getZoomValue(void){ return m_VidConfig.Zoom; }
+short CVideoDriver::getZoomValue()
+{ return m_VidConfig.Zoom; }
-void CVideoDriver::isFullscreen(bool value) {
- m_VidConfig.Fullscreen = value;
-}
+void CVideoDriver::isFullscreen(const bool value)
+{ m_VidConfig.Fullscreen = value; }
-short CVideoDriver::getFiltermode(void)
-{
- if(m_VidConfig.m_ScaleXFilter < 1)
- m_VidConfig.m_ScaleXFilter = 1;
- return m_VidConfig.m_ScaleXFilter;
-}
-
-bool CVideoDriver::getFullscreen(void)
+bool CVideoDriver::getFullscreen()
{ return m_VidConfig.Fullscreen; }
+
unsigned int CVideoDriver::getWidth() const
{ return m_VidConfig.m_Resolution.width; }
+
unsigned int CVideoDriver::getHeight() const
{ return m_VidConfig.m_Resolution.height; }
+
unsigned short CVideoDriver::getDepth() const
{ return m_VidConfig.m_Resolution.depth; }
-SDL_Surface *CVideoDriver::getScrollSurface(void)
-{ return mp_VideoEngine->getScrollSurface(); }
+
+SDL_Surface *CVideoDriver::getScrollSurface()
+{ return mp_VideoEngine->getScrollSurface(); }
st_camera_bounds &CVideoDriver::getCameraBounds()
-{ return m_VidConfig.m_CameraBounds; }
+{ return m_VidConfig.m_CameraBounds; }
void CVideoDriver::stop()
{
diff --git a/src/sdl/CVideoDriver.h b/src/sdl/CVideoDriver.h
index f8c789a..a083c7b 100644
--- a/src/sdl/CVideoDriver.h
+++ b/src/sdl/CVideoDriver.h
@@ -51,13 +51,20 @@ public:
void DeleteConsoleMsgs(void);
void AddConsoleMsg(const char *the_msg);
+
+ /**
+ * \description This function saves the given camera bounds. It is usually called
+ * by a menu item.
+ * \param CameraBounds The Camera Bound configuration as input.
+ * Those might be corrected depending on how the user
+ * chose them.
+ */
void saveCameraBounds(st_camera_bounds &CameraBounds);
CVidConfig &getVidConfig();
- short getZoomValue(void);
- bool getShowFPS(void);
- short getFiltermode(void);
- bool getFullscreen(void);
+ short getZoomValue();
+ bool getShowFPS();
+ bool getFullscreen();
unsigned int getWidth() const;
unsigned int getHeight() const;
unsigned short getDepth() const;
diff --git a/src/sdl/sound/CSound.cpp b/src/sdl/sound/CSound.cpp
index ae712b0..59406a2 100644
--- a/src/sdl/sound/CSound.cpp
+++ b/src/sdl/sound/CSound.cpp
@@ -6,7 +6,6 @@
*/
#include "CSound.h"
-#include "keen.h"
#include "fileio.h"
#include "fileio/ResourceMgmt.h"
#include "CLogFile.h"
hooks/post-receive
--
clonekeenplus
|
|
From: Gerstrong <ger...@us...> - 2011-09-18 16:54:20
|
via 2793f76aa38716883647b78a4b243c6a8cda164b (commit)
via 05e7f1615494e4f462294a05c327f3ef483ad455 (commit)
via 5dea742510bc293cbca3dcf3303ecfa68b19e069 (commit)
via 2f12705c50813a84d89530311a38a799e70dbb89 (commit)
from f3c08da2597679806b460f4b8a3498e955f03d06 (commit)
- Log -----------------------------------------------------------------
commit 2793f76aa38716883647b78a4b243c6a8cda164b
Author: Gerstrong <ger...@gm...>
Date: Sun Sep 18 18:53:14 2011 +0200
Small bounce change to the mad mushroom
commit 05e7f1615494e4f462294a05c327f3ef483ad455
Author: Gerstrong <ger...@gm...>
Date: Sun Sep 18 18:52:41 2011 +0200
Mimrock changes
commit 5dea742510bc293cbca3dcf3303ecfa68b19e069
Author: Gerstrong <ger...@gm...>
Date: Sun Sep 18 18:24:20 2011 +0200
Mimrock changes
commit 2f12705c50813a84d89530311a38a799e70dbb89
Author: Gerstrong <ger...@gm...>
Date: Sun Sep 18 18:08:48 2011 +0200
Added Mimrock
-----------------------------------------------------------------------
Summary of changes:
src/engine/galaxy/CMapLoaderGalaxy.cpp | 7 ++
src/engine/galaxy/ai/ep4/CMadMushroom.cpp | 2 +-
src/engine/galaxy/ai/ep4/CMimrock.cpp | 99 +++++++++++++++++++++++++++++
src/engine/galaxy/ai/ep4/CMimrock.h | 31 +++++++++
4 files changed, 138 insertions(+), 1 deletions(-)
create mode 100644 src/engine/galaxy/ai/ep4/CMimrock.cpp
create mode 100644 src/engine/galaxy/ai/ep4/CMimrock.h
diff --git a/src/engine/galaxy/CMapLoaderGalaxy.cpp b/src/engine/galaxy/CMapLoaderGalaxy.cpp
index 1acbb10..53f213c 100644
--- a/src/engine/galaxy/CMapLoaderGalaxy.cpp
+++ b/src/engine/galaxy/CMapLoaderGalaxy.cpp
@@ -40,6 +40,7 @@
#include "engine/galaxy/ai/ep4/CLick.h"
#include "engine/galaxy/ai/ep4/CLindsey.h"
#include "engine/galaxy/ai/ep4/CSkypest.h"
+#include "engine/galaxy/ai/ep4/CMimrock.h"
// General stuff
#include "engine/galaxy/ai/CSpriteItem.h"
@@ -424,6 +425,12 @@ void CMapLoaderGalaxy::addFoe(CMap &Map, word foe, size_t x, size_t y)
p_newfoe = new galaxy::CBounder(&Map, x, y-250);
break;
+ case 19:
+ //This is a Mimrock.
+ // TODO: Those relative coordinates are not a good sign. Try to remove them and make the Sprite substract them
+ p_newfoe = new galaxy::CMimrock(&Map, x, y-(2<<CSF));
+ break;
+
case 21:
// This is a Mad Mushroom.
diff --git a/src/engine/galaxy/ai/ep4/CMadMushroom.cpp b/src/engine/galaxy/ai/ep4/CMadMushroom.cpp
index 4b6c859..f5c92d6 100644
--- a/src/engine/galaxy/ai/ep4/CMadMushroom.cpp
+++ b/src/engine/galaxy/ai/ep4/CMadMushroom.cpp
@@ -68,7 +68,7 @@ void CMadMushroom::process()
yinertia = -MUSHROOM_LOW_INERTIA;
jumpcounter++;
- if( jumpcounter>=2 )
+ if( jumpcounter>=3 )
{
yinertia = -MUSHROOM_HIGH_INERTIA;
jumpcounter = 0;
diff --git a/src/engine/galaxy/ai/ep4/CMimrock.cpp b/src/engine/galaxy/ai/ep4/CMimrock.cpp
new file mode 100644
index 0000000..5f0438f
--- /dev/null
+++ b/src/engine/galaxy/ai/ep4/CMimrock.cpp
@@ -0,0 +1,99 @@
+/*
+ * CMimrock.cpp
+ *
+ * Created on: 18.09.2011
+ * Author: gerstrong
+ */
+
+#include "CMimrock.h"
+#include "engine/galaxy/ai/CPlayerBase.h"
+
+namespace galaxy {
+
+#define A_MIMROCK_SIT 0
+#define A_MIMROCK_WALK 1
+#define A_MIMROCK_JUMP 7
+#define A_MIMROCK_BOUNCE 10
+#define A_MIMROCK_STUNNED 11
+
+const int CSF_DISTANCE_TO_FOLLOW_TOLERANCE = 2<<CSF;
+const int WALK_SPEED = 10;
+
+CMimrock::CMimrock(CMap *pmap, Uint32 x, Uint32 y) :
+CObject(pmap, x, y, OBJ_NONE),
+CStunnable(pmap, x, y, OBJ_NONE)
+{
+ setupGalaxyObjectOnMap(0x343A, A_MIMROCK_SIT);
+ mp_processState = (void (CStunnable::*)()) &CMimrock::processSit;
+ m_hDir = NONE;
+}
+
+
+bool CMimrock::isNearby(CObject &theObject)
+{
+ if( CPlayerBase *player = dynamic_cast<CPlayerBase*>(&theObject) )
+ {
+ const int dx = player->getXMidPos() - getXMidPos();
+
+ if( dx>-CSF_DISTANCE_TO_FOLLOW_TOLERANCE &&
+ dx<+CSF_DISTANCE_TO_FOLLOW_TOLERANCE )
+ {
+ if( dx<0 )
+ m_hDir = LEFT;
+ else
+ m_hDir = RIGHT;
+
+ setAction(A_MIMROCK_WALK);
+ mp_processState = (void (CStunnable::*)()) &CMimrock::processWalk;
+ }
+ }
+
+ return true;
+}
+
+void CMimrock::processSit()
+{
+ // When sitting the rock doesn't do any thing, so this stays empty for now.
+}
+
+void CMimrock::processWalk()
+{
+ if(m_hDir == LEFT)
+ moveLeft(WALK_SPEED);
+ else
+ moveRight(WALK_SPEED);
+
+ if(getActionStatus(A_MIMROCK_SIT))
+ {
+ setAction(A_MIMROCK_SIT);
+ mp_processState = (void (CStunnable::*)()) &CMimrock::processSit;
+ }
+}
+
+void CMimrock::processJump()
+{
+ // TODO: Code here!
+}
+
+void CMimrock::processBounce()
+{
+ // TODO: Code here!
+}
+
+void CMimrock::processStunned()
+{
+ // TODO: Code here!
+}
+
+void CMimrock::process()
+{
+ performCollisions();
+ processFalling();
+
+ (this->*mp_processState)();
+
+ processActionRoutine();
+}
+
+
+} /* namespace galaxy */
diff --git a/src/engine/galaxy/ai/ep4/CMimrock.h b/src/engine/galaxy/ai/ep4/CMimrock.h
new file mode 100644
index 0000000..e414df9
--- /dev/null
+++ b/src/engine/galaxy/ai/ep4/CMimrock.h
@@ -0,0 +1,31 @@
+/*
+ * CMimrock.h
+ *
+ * Created on: 18.09.2011
+ * Author: gerstrong
+ */
+
+#ifndef CMIMROCK_H_
+#define CMIMROCK_H_
+
+#include "engine/galaxy/ai/CStunnable.h"
+
+namespace galaxy {
+
+class CMimrock: public CStunnable
+{
+public:
+
+ CMimrock(CMap *pmap, Uint32 x, Uint32 y);
+
+ bool isNearby(CObject &theObject);
+ void process();
+ void processSit();
+ void processWalk();
+ void processJump();
+ void processBounce();
+ void processStunned();
+};
+
+} /* namespace galaxy */
+#endif /* CMIMROCK_H_ */
hooks/post-receive
--
clonekeenplus
|
|
From: Gerstrong <ger...@us...> - 2011-08-29 09:10:51
|
via f3c08da2597679806b460f4b8a3498e955f03d06 (commit)
via 71f0a0a4da09e5c0e8ba4343a3f3aca1e51cf745 (commit)
from 1e916e86bbac3cf94f3387edaf083f7db9fd82da (commit)
- Log -----------------------------------------------------------------
commit f3c08da2597679806b460f4b8a3498e955f03d06
Author: Gerstrong <ger...@gm...>
Date: Mon Aug 29 11:08:53 2011 +0200
Full Skypest AI is now in!
commit 71f0a0a4da09e5c0e8ba4343a3f3aca1e51cf745
Author: Gerstrong <ger...@gm...>
Date: Sun Aug 28 20:59:47 2011 +0200
Website Update
-----------------------------------------------------------------------
Summary of changes:
src/engine/galaxy/ai/CPlayerLevel.cpp | 1 -
src/engine/galaxy/ai/CPlayerLevel.h | 8 +++
src/engine/galaxy/ai/ep4/CSkypest.cpp | 93 +++++++++++++++++++++++++++++++++
src/engine/galaxy/ai/ep4/CSkypest.h | 9 +++
website/download.html | 24 ++++----
website/news.html | 7 +++
6 files changed, 129 insertions(+), 13 deletions(-)
diff --git a/src/engine/galaxy/ai/CPlayerLevel.cpp b/src/engine/galaxy/ai/CPlayerLevel.cpp
index 21f1684..d001d9a 100644
--- a/src/engine/galaxy/ai/CPlayerLevel.cpp
+++ b/src/engine/galaxy/ai/CPlayerLevel.cpp
@@ -272,7 +272,6 @@ void CPlayerLevel::processMovingHorizontal()
-
// Here all the pogo code is processed
void CPlayerLevel::processPogo()
{
diff --git a/src/engine/galaxy/ai/CPlayerLevel.h b/src/engine/galaxy/ai/CPlayerLevel.h
index b0cde7b..db31b6f 100644
--- a/src/engine/galaxy/ai/CPlayerLevel.h
+++ b/src/engine/galaxy/ai/CPlayerLevel.h
@@ -218,6 +218,14 @@ public:
void openDoorsTile();
void processPlaceGem();
+ // Checks if Keen is using the pogo. Skypest needs to know that,
+ // because it might get squashed.
+ bool isPogoing()
+ {
+ return (mp_processState == &CPlayerLevel::processPogo);
+ }
+
+
bool m_jumpdownfromobject;
diff --git a/src/engine/galaxy/ai/ep4/CSkypest.cpp b/src/engine/galaxy/ai/ep4/CSkypest.cpp
index 71890ba..3301ea7 100644
--- a/src/engine/galaxy/ai/ep4/CSkypest.cpp
+++ b/src/engine/galaxy/ai/ep4/CSkypest.cpp
@@ -6,6 +6,7 @@
*/
#include "CSkypest.h"
+#include "engine/galaxy/ai/CPlayerLevel.h"
namespace galaxy {
@@ -13,16 +14,108 @@ namespace galaxy {
#define A_SKYPEST_SQUISHED 2
#define A_SKYPEST_LICKEYES 3
+const int FLY_SPEED = 50;
CSkypest::CSkypest(CMap *pmap, Uint32 x, Uint32 y) :
CObject(pmap, x, y, OBJ_NONE)
{
setupGalaxyObjectOnMap(0x2486, A_SKYPEST_FLY);
+ mp_processState = &CSkypest::processFly;
+ m_hDir = RIGHT;
+ m_vDir = UP;
+}
+
+bool CSkypest::isNearby(CObject &theObject)
+{
+ if(getActionStatus(A_SKYPEST_LICKEYES))
+ {
+ if( CPlayerBase *player = dynamic_cast<CPlayerBase*>(&theObject) )
+ {
+ const int dx = player->getXMidPos() - getXMidPos();
+
+ if( dx<0 )
+ m_hDir = LEFT;
+ else
+ m_hDir = RIGHT;
+ }
+ }
+ return true;
+}
+
+void CSkypest::getTouchedBy(CObject &theObject)
+{
+ if(dead || theObject.dead)
+ return;
+
+ // When Keen touches the Council Member exit the level and add one to the council list
+ if( CPlayerLevel *Player = dynamic_cast<CPlayerLevel*>(&theObject) )
+ {
+ // Check if player is using pogo and Skypest is licking
+ if( getActionStatus(A_SKYPEST_LICKEYES) || Player->isPogoing() )
+ {
+ dead = true;
+ playSound(SOUND_SQUISH_SKYPEST);
+ setAction(A_SKYPEST_SQUISHED);
+ }
+ else
+ {
+ // else Keen will die
+ Player->kill();
+ }
+ }
+}
+
+void CSkypest::processOnFloor()
+{
+ if(getActionStatus(A_SKYPEST_FLY))
+ {
+ mp_processState = &CSkypest::processFly;
+ blockedu = blockedd = false;
+ blockedl = blockedr = false;
+ setAction(A_SKYPEST_FLY);
+ }
+}
+
+void CSkypest::processFly()
+{
+ // Flying to the direction Code
+ if(blockedd)
+ {
+ m_vDir = UP;
+ mp_processState = &CSkypest::processOnFloor;
+ setAction(A_SKYPEST_LICKEYES);
+ }
+ else if(blockedu)
+ {
+ m_vDir = DOWN;
+ }
+
+ if(blockedl)
+ {
+ m_hDir = RIGHT;
+ }
+ else if(blockedr)
+ {
+ m_hDir = LEFT;
+ }
+
+ // When someting is blocking change the direction
+ if(m_vDir == UP)
+ moveUp(FLY_SPEED);
+ else if(m_vDir == DOWN)
+ moveDown(FLY_SPEED);
+
+ if(m_hDir == LEFT)
+ moveLeft(FLY_SPEED);
+ else if(m_hDir == RIGHT)
+ moveRight(FLY_SPEED);
}
void CSkypest::process()
{
processActionRoutine();
+
+ (this->*mp_processState)();
}
} /* namespace galaxy */
diff --git a/src/engine/galaxy/ai/ep4/CSkypest.h b/src/engine/galaxy/ai/ep4/CSkypest.h
index 3a6e9e5..57f8b95 100644
--- a/src/engine/galaxy/ai/ep4/CSkypest.h
+++ b/src/engine/galaxy/ai/ep4/CSkypest.h
@@ -18,6 +18,15 @@ public:
CSkypest(CMap *pmap, Uint32 x, Uint32 y);
void process();
+ void getTouchedBy(CObject &theObject);
+ bool isNearby(CObject &theObject);
+
+private:
+
+ void processOnFloor();
+ void processFly();
+
+ void (CSkypest::*mp_processState)();
};
} /* namespace galaxy */
diff --git a/website/download.html b/website/download.html
index 5fad864..5f72efa 100644
--- a/website/download.html
+++ b/website/download.html
@@ -83,31 +83,31 @@
<p>
<img width = "32px" height = "30px" alt="Win7" src = "img/win7.png" />
- Windows (98, ME, 2000, XP, Vista, 7 and others) - Version 0.3.6.1 -
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.6/CGenius-0.3.6.1-WIN32.exe/download">Installer (32 bit)</a>
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.6/CGenius-0.3.6.1-WIN32.zip/download">ZIP Package (32 bit)</a>
+ Windows (98, ME, 2000, XP, Vista, 7 and others) - Version 0.3.7 -
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-WIN32.exe/download">Installer (32 bit)</a>
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-WIN32.zip/download">ZIP Package (32 bit)</a>
</p>
<p>
<img width = "44px" height = "48px" alt="Linux" src = "img/linux.jpg" />
- Linux (Binary only) - Version 0.3.6.1 -
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.6/CGenius-0.3.6.1-i386.tar.gz/download">32-bit</a>
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.6/CGenius-0.3.6.1-amd64.tar.gz/download">64-bit</a>
+ Linux (Binary only) - Version 0.3.7 -
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-i386.tar.gz/download">32-bit</a>
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-amd64.tar.gz/download">64-bit</a>
</p>
<p>
<img width = "48px" height = "44px" alt="Linux" src = "img/ubuntu.jpg" />
- Ubuntu Linux (11.04 and higher recommended) and Debian based distros - Version 0.3.6.1 -
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.6/CGenius-0.3.6.1-i386.deb/download">32-bit</a>
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.6/CGenius-0.3.6.1-amd64.deb/download">64-bit</a>
+ Ubuntu Linux (11.04 and higher recommended) and Debian based distros - Version 0.3.7 -
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-i386.deb/download">32-bit</a>
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-amd64.deb/download">64-bit</a>
</p>
<p>
<img width = "48px" height = "44px" alt="Linux" src = "img/fedorasuse.png" />
- Fedora (15+) or OpenSuse (11.4+) and RPM based distros - Version 0.3.6.1 -
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.6/CGenius-0.3.6.1-i386.rpm/download">32-bit</a>
- <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.6/CGenius-0.3.6.1-amd64.rpm/download">64-bit</a>
+ Fedora (15+) or OpenSuse (11.4+) and RPM based distros - Version 0.3.7 -
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-i386.rpm/download">32-bit</a>
+ <a href="http://sourceforge.net/projects/clonekeenplus/files/Commander%20Genius/Version%200.3.7/CGenius-0.3.7-amd64.rpm/download">64-bit</a>
</p>
<p>
diff --git a/website/news.html b/website/news.html
index 46bb34f..e807b8e 100644
--- a/website/news.html
+++ b/website/news.html
@@ -72,6 +72,13 @@
<div></div>
<h1>News</h1>
<div class = "fauxTable">
+ <h2>August 28th 2011</h2>
+ <p>
+ - Updated Commander Genius (ver. 0.3.7).
+ <a href = "download.html">Go check it out!</a>
+ </p>
+ </div>
+ <div class = "fauxTable">
<h2>August 3rd 2011</h2>
<p>
- Updated Commander Genius (ver. 0.3.6.1).
hooks/post-receive
--
clonekeenplus
|