fixed merge conflict

This commit is contained in:
Jeffrey Ventrella 2013-05-11 11:50:19 -07:00
parent 5c10ca5677
commit 442632f467

View file

@ -325,8 +325,8 @@ void init(void) {
handControl.setScreenDimensions(::screenWidth, ::screenHeight);
headMouseX = WIDTH /2;
headMouseY = HEIGHT/2;
headMouseX = ::screenWidth /2;
headMouseY = ::screenHeight/2;
stars.readInput(starFile, starCacheFile, 0);