Merge branch 'TASK1B' of https://github.com/mariuszlisowski/object-oriented-programming into TASK1B

BarTes8 · BarTes8 · commit a6c2b3fdbdeb · 2021-07-06T16:01:52.000+02:00
diff --git a/shm/src/Store.cpp b/shm/src/Store.cpp
@@ -22,10 +22,14 @@ Store::Response Store::buy(Cargo* cargo, size_t amount, Player* player) {
 }
 
 Store::Response Store::sell(Cargo* cargo, size_t amount, Player* player) {
+<<<<<<< HEAD
     if (!cargo) {
         return Response::lack_of_cargo;
     }
     if (cargo->getAmount() + amount > STORE_CAPACITY) {
+=======
+    if (cargo->getAmount() + amount > Store::STORE_CAPACITY) {
+>>>>>>> df1858499674b7da1cc130f18aff165908ce1d17
         return Response::lack_of_space;
     }
     return Response::done;

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,14 @@ Store::Response Store::buy(Cargo* cargo, size_t amount, Player* player) {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`Store::Response Store::sell(Cargo* cargo, size_t amount, Player* player) {`
	`25`	`+<<<<<<< HEAD`
`25`	`26`	`if (!cargo) {`
`26`	`27`	`return Response::lack_of_cargo;`
`27`	`28`	`}`
`28`	`29`	`if (cargo->getAmount() + amount > STORE_CAPACITY) {`
	`30`	`+=======`
	`31`	`+ if (cargo->getAmount() + amount > Store::STORE_CAPACITY) {`
	`32`	`+>>>>>>> df1858499674b7da1cc130f18aff165908ce1d17`
`29`	`33`	`return Response::lack_of_space;`
`30`	`34`	`}`
`31`	`35`	`return Response::done;`