add missing semicolon; pull pyx.properties properties out to build.properties
This commit is contained in:
parent
359c5e1140
commit
b8e499647e
|
@ -196,16 +196,16 @@ cah.ajax.ErrorHandlers[cah.$.AjaxOperation.LEAVE_GAME] = function(data, req) {
|
|||
cah.ajax.ErrorHandlers[cah.$.AjaxOperation.START_GAME] = function(data, req) {
|
||||
if (data[cah.$.AjaxResponse.ERROR_CODE] == cah.$.ErrorCode.NOT_ENOUGH_CARDS) {
|
||||
var msg = "With current settings, the game requires "
|
||||
+ data[cah.$.ErrorInformation.BLACK_CARDS_REQUIRED]
|
||||
+ " black cards and " + data[cah.$.ErrorInformation.WHITE_CARDS_REQUIRED]
|
||||
+ " white cards, but only has " + data[cah.$.ErrorInformation.BLACK_CARDS_PRESENT]
|
||||
+ " black cards and " + data[cah.$.ErrorInformation.WHITE_CARDS_PRESENT] + " white cards.";
|
||||
+ data[cah.$.ErrorInformation.BLACK_CARDS_REQUIRED] + " black cards and "
|
||||
+ data[cah.$.ErrorInformation.WHITE_CARDS_REQUIRED] + " white cards, but only has "
|
||||
+ data[cah.$.ErrorInformation.BLACK_CARDS_PRESENT] + " black cards and "
|
||||
+ data[cah.$.ErrorInformation.WHITE_CARDS_PRESENT] + " white cards.";
|
||||
|
||||
cah.log.status_with_game(req[cah.$.AjaxRequest.GAME_ID], msg, "error");
|
||||
} else {
|
||||
cah.log.error(cah.$.ErrorCode_msg[data[cah.$.AjaxResponse.ERROR_CODE]]);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
cah.ajax.SuccessHandlers[cah.$.AjaxOperation.START_GAME] = function(data, req) {
|
||||
var game = cah.currentGames[data[cah.$.AjaxRequest.GAME_ID]];
|
||||
|
|
|
@ -1,3 +1,8 @@
|
|||
pyx.cookie_domain=.localhost
|
||||
pyx.max_users=100
|
||||
pyx.max_games=25
|
||||
pyx.include_inactive_cardsets=true
|
||||
|
||||
# for production use, use postgres
|
||||
#hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
|
||||
#hibernate.driver_class=org.postgresql.Driver
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
pyx.client.cookie_domain=${pyx.cookie_domain}
|
||||
pyx.server.include_inactive_cardsets=${pyx.include_inactive_cardsets}
|
||||
pyx.server.max_users=${pyx.max_users}
|
||||
pyx.server.max_games=${pyx.max_games}
|
|
@ -1,4 +0,0 @@
|
|||
pyx.client.cookie_domain=.socialgamer.net
|
||||
pyx.server.include_inactive_cardsets=false
|
||||
pyx.server.max_users=1000
|
||||
pyx.server.max_games=225
|
Loading…
Reference in New Issue