Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Initial release of the cash shop sales #1825

Merged
merged 14 commits into from Feb 15, 2017
+749 −20
Merged

Initial release of the cash shop sales #1825

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b59250c
Initial release of the cash shop sales
Lemongrass3110 Dec 24, 2016
2f63aba
Fixed a typo in the config
Lemongrass3110 Dec 25, 2016
9384bd0
Added a permission for the cashshop sales
Lemongrass3110 Dec 25, 2016
1ff4c47
Added packet lengths to the hardcoded table
Lemongrass3110 Dec 25, 2016
4370d31
Forgot to actually store the changed amount
Lemongrass3110 Dec 25, 2016
038c4d7
Fixed memory leaks
Lemongrass3110 Dec 25, 2016
732f47a
Fixed an error where freed data was changed
Lemongrass3110 Dec 27, 2016
c0339a9
Removed unused price column
Lemongrass3110 Dec 28, 2016
944b53c
Fixed memory reorganization after buyout
Lemongrass3110 Dec 28, 2016
d2f8852
Fixed an incorrect insert statement
aleos89 Dec 29, 2016
44c7ebe
Corrections in some packet definition comments
Lemongrass3110 Jan 3, 2017
25bd581
A few minor cleanups
Lemongrass3110 Feb 10, 2017
77fe1a0
Merge branch 'master' into feature/cashshop-sale
Lemongrass3110 Feb 15, 2017
34f8782
Renamed sql upgrade to match the current date
Lemongrass3110 Feb 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Next
Fixed an incorrect insert statement 
* Follow up to c0339a9.
Thanks to fictionx!
  • Loading branch information
@aleos89
aleos89 committed Dec 29, 2016
commit d2f8852a56f6e2510b9cd0b5f9afac36ec6c6063
2 src/map/cashshop.c
View file
Open in desktop
@@ -292,7 +292,7 @@ enum e_sale_add_result sale_add_item( uint16 nameid, int32 count, time_t from, t
return SALE_ADD_DUPLICATE;
}

if( SQL_ERROR == Sql_Query(mmysql_handle, "INSERT INTO `%s`(`nameid`,`start`,`end`,`amount`) VALUES ( '%d', FROM_UNIXTIME(%d), FROM_UNIXTIME(%d), '%d', '%d' )", sales_table, nameid, (uint32)from, (uint32)to, cash_shop_items[CASHSHOP_TAB_SALE].item[i]->price, count) ){
if( SQL_ERROR == Sql_Query(mmysql_handle, "INSERT INTO `%s`(`nameid`,`start`,`end`,`amount`) VALUES ( '%d', FROM_UNIXTIME(%d), FROM_UNIXTIME(%d), '%d' )", sales_table, nameid, (uint32)from, (uint32)to, count) ){
Sql_ShowDebug(mmysql_handle);
return SALE_ADD_FAILED;
}