aboutsummaryrefslogtreecommitdiff
path: root/src/inventory.h
Commit message (Collapse)AuthorAge
* Omnicleanup: header cleanup, add ModApiUtil shared between game and mainmenuKahrl2013-08-14
|
* Dont write player files all the timePilzAdam2013-06-28
|
* Update Copyright YearsSfan52013-02-24
|
* Change Minetest-c55 to MinetestPilzAdam2013-02-24
|
* Add InventoryList width property & allow custom crafting grids.Ilya Zhuravlev2012-09-01
|
* Optimize headersPerttu Ahola2012-06-17
|
* Switch the license to be LGPLv2/later, with small parts still remaining as ↵Perttu Ahola2012-06-05
| | | | GPLv2/later, by agreement of major contributors
* Fix loading of legacy chestsPerttu Ahola2012-06-03
|
* NodeMetaRef:{to,from}_table and lua_api.txt additionsPerttu Ahola2012-06-03
|
* added PlayerSAO and RemotePlayer, removed ServerRemotePlayerKahrl2012-03-29
|
* Digging time groups WIPPerttu Ahola2012-03-10
|
* Client-side prediction of inventory changes, and some inventory menu fixesKahrl2012-01-22
|
* The huge item definition and item namespace unification patch (itemdef), see ↵Kahrl2012-01-12
| | | | http://c55.me/minetest/wiki/doku.php?id=changes:itemdef
* Add InvRef and InvStack (currently untested and unusable)Perttu Ahola2012-01-02
|
* Add virtual destructors to abstract classesGiuseppe Bilotta2011-12-28
| | | | | | | IRespawnInitiator and InventoryActions are abstract classes, but they were missing a virtual destructor. Define it, even if it does nothing and its absence most likely makes no difference other tha causing warnings during compile.
* Make ToolItem and MaterialItem to convert names by aliases at creation time ↵Perttu Ahola2011-12-04
| | | | too (necessary for eg. crafting)
* Convert CraftItems directly to the name pointed by alias; necessary due to ↵Perttu Ahola2011-12-04
| | | | lua definition table
* Show infotext for unknown items placed on groundPerttu Ahola2011-12-03
|
* Rename "NodeItem"/"ToolItem"/"CraftItem" to "node"/"tool"/"craft"Perttu Ahola2011-12-02
|
* Fix structs being declared as classesGiuseppe Bilotta2011-12-01
| | | | | | Some compilers complain when a class is declared as a struct or vice versa. Fix by making sure that the correct tag is used both in declaration and definition.
* Do not assert if count becomes larger than getStackMax() in ↵Perttu Ahola2011-12-01
| | | | InventoryItem::add(); it is nicer for scripting and overall hacking this way, because rising it higher than the limit is does not break anything. It should be, and is, enforced elsewhere where appropriate.
* CraftItem rework and Lua interfaceKahrl2011-11-29
|
* Fix stuff in inventory.{cpp,h}Perttu Ahola2011-11-29
|
* Add IDropAction and related stuffKahrl2011-11-29
|
* Crafting definition in scriptsPerttu Ahola2011-11-29
|
* Improve item serializationPerttu Ahola2011-11-29
|
* Clean InventoryItem interface a bitPerttu Ahola2011-11-29
|
* Improved MaterialItem (stores nodename)Perttu Ahola2011-11-29
|
* Remove burn time definitions from FurnaceNodeMetadataPerttu Ahola2011-11-29
|
* Clean mapnode.h and fix other files accordinglyPerttu Ahola2011-11-29
|
* Create framework for getting rid of global definitions of ↵Perttu Ahola2011-11-29
| | | | node/tool/item/whatever types
* Move tool stuff to tool.{h,cpp}Perttu Ahola2011-11-29
|
* Move ContentFeatures to mapnode_contentfeatures.{h,cpp} and clean stuffPerttu Ahola2011-11-29
|
* Scripting WIP: dynamic object stuffPerttu Ahola2011-11-29
|
* mobv2Perttu Ahola2011-10-15
|
* Convert any inventory item into a mesh, bring back ↵Kahrl2011-09-19
| | | | InventoryItem::getImageRay(), some const-correctness fixes
* Added sprite extruderKahrl2011-09-19
|
* inventory displays tool breakage bar againKahrl2011-09-08
|
* Display which tool the player is holdingJacobF2011-09-07
| | | | And some simple animation when trying to dig...
* Now SAOs will reflect changes to their temporary inventory objectJacobF2011-09-06
| | | | | Also, the temp item wasn't being deleted, might have been a memory leak. Now you will only eat 1 item off a stack
* Merged 2 branches because they relied on each other.JacobF2011-08-25
| | | | | | | | | | | This one contains these changes from main c55: * Adds a function to check if there is room for a specific item * Using that, you can now pick up rats if you have a full inventory and a not full rat stack * Furnace would cook only 1 item if that item used the last available result slot, now it will continue * Furnace will say it's overloaded * Furnace won't wait until the next step to start on the next item - This caused small fuels to cook slower than meant to - Also caused furnaces to say they were out of fuel after finishing the last fuel item
* constify inventory item serializationGiuseppe Bilotta2011-08-11
|
* Some inventory const-ificationGiuseppe Bilotta2011-08-11
|
* InventoryAction is a struct, not a classGiuseppe Bilotta2011-08-08
|
* Added MaterialItem conversion from old content type namespace to newPerttu Ahola2011-07-31
|
* Rats are now eatable. Also made their selection box move smoothly.Perttu Ahola2011-07-30
|
* extended content-type rangePerttu Ahola2011-07-23
|
* Removed IrrlichtWrapperPerttu Ahola2011-04-22
|
* Some work-in-progress in hp and mobs and a frightening amount of random fixes.Perttu Ahola2011-04-21
|
* item drop multiplication fixPerttu Ahola2011-04-19
|
ze); for(u32 i=0; i<s_size; i++) { is.read(&buf[0], 2); wchar_t c16 = readU16((u8*)buf); s.append(&c16, 1); } return s; } // Creates a string with the length as the first four bytes std::string serializeLongString(const std::string &plain) { char buf[4]; writeU32((u8*)&buf[0], plain.size()); std::string s; s.append(buf, 4); s.append(plain); return s; } // Reads a string with the length as the first four bytes std::string deSerializeLongString(std::istream &is) { char buf[4]; is.read(buf, 4); if(is.gcount() != 4) throw SerializationError("deSerializeLongString: size not read"); u32 s_size = readU32((u8*)buf); std::string s; if(s_size == 0) return s; Buffer<char> buf2(s_size); is.read(&buf2[0], s_size); s.reserve(s_size); s.append(&buf2[0], s_size); return s; } // Creates a string encoded in JSON format (almost equivalent to a C string literal) std::string serializeJsonString(const std::string &plain) { std::ostringstream os(std::ios::binary); os<<"\""; for(size_t i = 0; i < plain.size(); i++) { char c = plain[i]; switch(c) { case '"': os<<"\\\""; break; case '\\': os<<"\\\\"; break; case '/': os<<"\\/"; break; case '\b': os<<"\\b"; break; case '\f': os<<"\\f"; break; case '\n': os<<"\\n"; break; case '\r': os<<"\\r"; break; case '\t': os<<"\\t"; break; default: { if(c >= 32 && c <= 126) { os<<c; } else { u32 cnum = (u32) (u8) c; os<<"\\u"<<std::hex<<std::setw(4)<<std::setfill('0')<<cnum; } break; } } } os<<"\""; return os.str(); } // Reads a string encoded in JSON format std::string deSerializeJsonString(std::istream &is) { std::ostringstream os(std::ios::binary); char c, c2; // Parse initial doublequote is >> c; if(c != '"') throw SerializationError("JSON string must start with doublequote"); // Parse characters for(;;) { c = is.get(); if(is.eof()) throw SerializationError("JSON string ended prematurely"); if(c == '"') { return os.str(); } else if(c == '\\') { c2 = is.get(); if(is.eof()) throw SerializationError("JSON string ended prematurely"); switch(c2) { default: os<<c2; break; case 'b': os<<'\b'; break; case 'f': os<<'\f'; break; case 'n': os<<'\n'; break; case 'r': os<<'\r'; break; case 't': os<<'\t'; break; case 'u': { char hexdigits[4+1]; is.read(hexdigits, 4); if(is.eof()) throw SerializationError("JSON string ended prematurely"); hexdigits[4] = 0; std::istringstream tmp_is(hexdigits, std::ios::binary); int hexnumber; tmp_is >> std::hex >> hexnumber; os<<((char)hexnumber); break; } } } else { os<<c; } } return os.str(); } bool deSerializeStringToStruct(std::string valstr, std::string format, void *out, size_t olen) { size_t len = olen; std::vector<std::string *> strs_alloced; std::string *str; char *f, *snext; size_t pos; char *s = &valstr[0]; char *buf = new char[len]; char *bufpos = buf; char *fmtpos, *fmt = &format[0]; while ((f = strtok_r(fmt, ",", &fmtpos)) && s) { fmt = NULL; bool is_unsigned = false; int width = 0; char valtype = *f; width = (int)strtol(f + 1, &f, 10); if (width && valtype == 's') valtype = 'i'; switch (valtype) { case 'u': is_unsigned = true; /* FALLTHROUGH */ case 'i': if (width == 16) { bufpos += PADDING(bufpos, u16); if ((bufpos - buf) + sizeof(u16) <= len) { if (is_unsigned) *(u16 *)bufpos = (u16)strtoul(s, &s, 10); else *(s16 *)bufpos = (s16)strtol(s, &s, 10); } bufpos += sizeof(u16); } else if (width == 32) { bufpos += PADDING(bufpos, u32); if ((bufpos - buf) + sizeof(u32) <= len) { if (is_unsigned) *(u32 *)bufpos = (u32)strtoul(s, &s, 10); else *(s32 *)bufpos = (s32)strtol(s, &s, 10); } bufpos += sizeof(u32); } else if (width == 64) { bufpos += PADDING(bufpos, u64); if ((bufpos - buf) + sizeof(u64) <= len) { if (is_unsigned) *(u64 *)bufpos = (u64)strtoull(s, &s, 10); else *(s64 *)bufpos = (s64)strtoll(s, &s, 10); } bufpos += sizeof(u64); } s = strchr(s, ','); break; case 'b': snext = strchr(s, ','); if (snext) *snext++ = 0; bufpos += PADDING(bufpos, bool); if ((bufpos - buf) + sizeof(bool) <= len) *(bool *)bufpos = is_yes(std::string(s)); bufpos += sizeof(bool); s = snext; break; case 'f': bufpos += PADDING(bufpos, float); if ((bufpos - buf) + sizeof(float) <= len) *(float *)bufpos = strtof(s, &s); bufpos += sizeof(float); s = strchr(s, ','); break; case 's': while (*s == ' ' || *s == '\t') s++; if (*s++ != '"') //error, expected string goto fail; snext = s; while (snext[0] && !(snext[-1] != '\\' && snext[0] == '"')) snext++; *snext++ = 0; bufpos += PADDING(bufpos, std::string *); str = new std::string(s); pos = 0; while ((pos = str->find("\\\"", pos)) != std::string::npos) str->erase(pos, 1); if ((bufpos - buf) + sizeof(std::string *) <= len) *(std::string **)bufpos = str; bufpos += sizeof(std::string *); strs_alloced.push_back(str); s = *snext ? snext + 1 : NULL; break; case 'v': while (*s == ' ' || *s == '\t') s++; if (*s++ != '(') //error, expected vector goto fail; if (width == 2) { bufpos += PADDING(bufpos, v2f); if ((bufpos - buf) + sizeof(v2f) <= len) { v2f *v = (v2f *)bufpos; v->X = strtof(s, &s); s++; v->Y = strtof(s, &s); } bufpos += sizeof(v2f); } else if (width == 3) { bufpos += PADDING(bufpos, v3f); if ((bufpos - buf) + sizeof(v3f) <= len) { v3f *v = (v3f *)bufpos; v->X = strtof(s, &s); s++; v->Y = strtof(s, &s); s++; v->Z = strtof(s, &s); } bufpos += sizeof(v3f); } s = strchr(s, ','); break; default: //error, invalid format specifier goto fail; } if (s && *s == ',') s++; if ((size_t)(bufpos - buf) > len) //error, buffer too small goto fail; } if (f && *f) { //error, mismatched number of fields and values fail: for (size_t i = 0; i != strs_alloced.size(); i++) delete strs_alloced[i]; delete[] buf; return false; } memcpy(out, buf, olen); delete[] buf; return true; } // Casts *buf to a signed or unsigned fixed-width integer of 'w' width #define SIGN_CAST(w, buf) (is_unsigned ? *((u##w *) buf) : *((s##w *) buf)) bool serializeStructToString(std::string *out, std::string format, void *value) { std::ostringstream os; std::string str; char *f; size_t strpos; char *bufpos = (char *) value; char *fmtpos, *fmt = &format[0]; while ((f = strtok_r(fmt, ",", &fmtpos))) { fmt = NULL; bool is_unsigned = false; int width = 0; char valtype = *f; width = (int)strtol(f + 1, &f, 10); if (width && valtype == 's') valtype = 'i'; switch (valtype) { case 'u': is_unsigned = true; /* FALLTHROUGH */ case 'i': if (width == 16) { bufpos += PADDING(bufpos, u16); os << SIGN_CAST(16, bufpos); bufpos += sizeof(u16); } else if (width == 32) { bufpos += PADDING(bufpos, u32); os << SIGN_CAST(32, bufpos); bufpos += sizeof(u32); } else if (width == 64) { bufpos += PADDING(bufpos, u64); os << SIGN_CAST(64, bufpos); bufpos += sizeof(u64); } break; case 'b': bufpos += PADDING(bufpos, bool); os << std::boolalpha << *((bool *) bufpos); bufpos += sizeof(bool); break; case 'f': bufpos += PADDING(bufpos, float); os << *((float *) bufpos); bufpos += sizeof(float); break; case 's': bufpos += PADDING(bufpos, std::string *); str = **((std::string **) bufpos); strpos = 0; while ((strpos = str.find('"', strpos)) != std::string::npos) { str.insert(strpos, 1, '\\'); strpos += 2; } os << str; bufpos += sizeof(std::string *); break; case 'v': if (width == 2) { bufpos += PADDING(bufpos, v2f); v2f *v = (v2f *) bufpos; os << '(' << v->X << ", " << v->Y << ')'; bufpos += sizeof(v2f); } else { bufpos += PADDING(bufpos, v3f); v3f *v = (v3f *) bufpos; os << '(' << v->X << ", " << v->Y << ", " << v->Z << ')'; bufpos += sizeof(v3f); } break; default: return false; } os << ", "; } *out = os.str(); // Trim off the trailing comma and space if (out->size() >= 2) { out->resize(out->size() - 2); } return true; } #undef SIGN_CAST